diff --git a/configs/dynamic-plugins/dynamic-plugins.yaml b/configs/dynamic-plugins/dynamic-plugins.yaml
index dcd51d55..9c37360e 100644
--- a/configs/dynamic-plugins/dynamic-plugins.yaml
+++ b/configs/dynamic-plugins/dynamic-plugins.yaml
@@ -12,7 +12,7 @@ plugins:
     enabled: true
 
   # Tech Radar frontend plugin
-  - package: 'oci://quay.io/rhdh/backstage-community-plugin-tech-radar:{{inherit}}'
+  - package: ref://backstage-community-plugin-tech-radar
     enabled: true
 
   # Quay plugins
@@ -36,36 +36,20 @@ plugins:
                       - isQuayAvailable
 
   # Scaffolder Github plugin - used by Dynamic Plugin Software Templates
-  - package: 'oci://quay.io/rhdh/backstage-plugin-scaffolder-backend-module-github:{{inherit}}'
+  - package: ref://backstage-plugin-scaffolder-backend-module-github
     enabled: true
 
   #########################################################
   # Enable dynamic plugins installation by using Extensions
   #########################################################
 
-  # RHDH no longer embeds these plugin wrappers in dynamic-plugins/dist.
-  # Disable the obsolete catalog entries so they are omitted from generated
-  # configuration, then replace them with the OCI artifacts.
-  # Remove once RHDHBUGS-3710 is resolved.
-  - package: './dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-catalog-backend-module-extensions-dynamic'
-    enabled: false
-
-  - package: './dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-extensions'
-    enabled: false
-
-  - package: './dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-extensions-backend-dynamic'
-    enabled: false
-
-  - package: 'oci://quay.io/rhdh/red-hat-developer-hub-backstage-plugin-catalog-backend-module-extensions:2.0.0--0.19.1!red-hat-developer-hub-backstage-plugin-catalog-backend-module-extensions'
+  - package: ref://red-hat-developer-hub-backstage-plugin-catalog-backend-module-extensions
     enabled: true
-    pluginConfig:
-      extensions:
-        directory: ${RHDH_EXTENSIONS_DIRECTORY}
 
-  - package: 'oci://quay.io/rhdh/red-hat-developer-hub-backstage-plugin-extensions:2.0.0--0.19.1!red-hat-developer-hub-backstage-plugin-extensions'
+  - package: ref://red-hat-developer-hub-backstage-plugin-extensions
     enabled: true
 
-  - package: 'oci://quay.io/rhdh/red-hat-developer-hub-backstage-plugin-extensions-backend:2.0.0--0.19.1!red-hat-developer-hub-backstage-plugin-extensions-backend'
+  - package: ref://red-hat-developer-hub-backstage-plugin-extensions-backend
     enabled: true
     pluginConfig:
       extensions:
@@ -81,9 +65,9 @@ plugins:
   #########################################################
 
   # Developer Hub Intelligent Assistant frontend plugin
-  - package: 'ref://red-hat-developer-hub-backstage-plugin-intelligent-assistant'
+  - package: ref://red-hat-developer-hub-backstage-plugin-intelligent-assistant
     enabled: true
 
   # Developer Hub Intelligent Assistant backend plugin
-  - package: 'ref://red-hat-developer-hub-backstage-plugin-intelligent-assistant-backend'
+  - package: ref://red-hat-developer-hub-backstage-plugin-intelligent-assistant-backend
     enabled: true
diff --git a/orchestrator/README.md b/orchestrator/README.md
index c194e974..a9f6d263 100644
--- a/orchestrator/README.md
+++ b/orchestrator/README.md
@@ -13,21 +13,21 @@ includes:
 
 # Add the Orchestrator plugins directly, and add any other plugins you want to install, including local ones.
 plugins:
-  - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator:{{inherit}}'
+  - package: ref://red-hat-developer-hub-backstage-plugin-orchestrator
     enabled: true
-  - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator-backend:{{inherit}}'
+  - package: ref://red-hat-developer-hub-backstage-plugin-orchestrator-backend
     enabled: true
     pluginConfig:
       orchestrator:
         dataIndexService:
           url: http://sonataflow:8899
-  - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-scaffolder-backend-module-orchestrator:{{inherit}}'
+  - package: ref://red-hat-developer-hub-backstage-plugin-scaffolder-backend-module-orchestrator
     enabled: true
     pluginConfig:
       orchestrator:
         dataIndexService:
           url: http://sonataflow:8899
-  - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator-form-widgets:{{inherit}}'
+  - package: ref://red-hat-developer-hub-backstage-plugin-orchestrator-form-widgets
     enabled: true
 ```
 
diff --git a/orchestrator/configs/dynamic-plugins/dynamic-plugins.yaml b/orchestrator/configs/dynamic-plugins/dynamic-plugins.yaml
index 50df6941..cae28d09 100644
--- a/orchestrator/configs/dynamic-plugins/dynamic-plugins.yaml
+++ b/orchestrator/configs/dynamic-plugins/dynamic-plugins.yaml
@@ -3,19 +3,19 @@ includes:
   - dynamic-plugins.default.yaml
 
 plugins:
-  - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator:{{inherit}}'
+  - package: ref://red-hat-developer-hub-backstage-plugin-orchestrator
     enabled: true
-  - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator-backend:{{inherit}}'
+  - package: ref://red-hat-developer-hub-backstage-plugin-orchestrator-backend
     enabled: true
     pluginConfig:
       orchestrator:
         dataIndexService:
           url: http://sonataflow:8899
-  - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-scaffolder-backend-module-orchestrator:{{inherit}}'
+  - package: ref://red-hat-developer-hub-backstage-plugin-scaffolder-backend-module-orchestrator
     enabled: true
     pluginConfig:
       orchestrator:
         dataIndexService:
           url: http://sonataflow:8899
-  - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator-form-widgets:{{inherit}}'
+  - package: ref://red-hat-developer-hub-backstage-plugin-orchestrator-form-widgets
     enabled: true