diff --git a/.github/workflows/merge-v5.yml b/.github/workflows/merge-v5.yml
index 025014d4c81..1894e8edd75 100644
--- a/.github/workflows/merge-v5.yml
+++ b/.github/workflows/merge-v5.yml
@@ -88,6 +88,7 @@ jobs:
       - name: Copy the distribution content to be used in docker copy command
         run: |
           cp -f container.application.properties ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/platform/application.properties
+          mkdir -p ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-5.0-distribution.tar.gz/assembly/platform/data/servers
           cp -r ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/opt/sample-configs/*-* ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/platform/data/servers
       - name: Build and push(egeria) to quay.io and docker.io (tag latest only for main!)
         if: ${{ github.ref == 'refs/heads/main'}}
diff --git a/.github/workflows/release-v5.yml b/.github/workflows/release-v5.yml
index 996b3eb0298..bd6be73f7e9 100644
--- a/.github/workflows/release-v5.yml
+++ b/.github/workflows/release-v5.yml
@@ -70,6 +70,7 @@ jobs:
       - name: Copy the distribution content to be used in docker copy command
         run: |
           cp -f container.application.properties ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/platform/application.properties
+          mkdir -p ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-5.0-distribution.tar.gz/assembly/platform/data/servers
           cp -r ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/opt/sample-configs/*-* ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/platform/data/servers
       - name: Build and push(egeria) to quay.io and docker.io
         uses: docker/build-push-action@v5
diff --git a/open-metadata-implementation/admin-services/admin-services-api/src/main/java/org/odpi/openmetadata/adminservices/configuration/registration/AccessServiceDescription.java b/open-metadata-implementation/admin-services/admin-services-api/src/main/java/org/odpi/openmetadata/adminservices/configuration/registration/AccessServiceDescription.java
index 639e5c5d115..6db03f65731 100644
--- a/open-metadata-implementation/admin-services/admin-services-api/src/main/java/org/odpi/openmetadata/adminservices/configuration/registration/AccessServiceDescription.java
+++ b/open-metadata-implementation/admin-services/admin-services-api/src/main/java/org/odpi/openmetadata/adminservices/configuration/registration/AccessServiceDescription.java
@@ -28,7 +28,7 @@ public enum AccessServiceDescription implements Serializable
      * Publish asset lineage.
      */
     ASSET_LINEAGE_OMAS               (203,
-                                      ComponentDevelopmentStatus.IN_DEVELOPMENT,
+                                      ComponentDevelopmentStatus.TECHNICAL_PREVIEW,
                                       "Asset Lineage",
                                       "Asset Lineage OMAS",
                                       "asset-lineage",
@@ -106,7 +106,7 @@ public enum AccessServiceDescription implements Serializable
      * Exchange process models and lineage with a data engine.
      */
     DATA_ENGINE_OMAS                 (209,
-                                      ComponentDevelopmentStatus.IN_DEVELOPMENT,
+                                      ComponentDevelopmentStatus.DEPRECATED,
                                       "Data Engine",
                                       "Data Engine OMAS",
                                       "data-engine",
@@ -158,7 +158,7 @@ public enum AccessServiceDescription implements Serializable
      * Design of the digital services for an organization.
      */
     DIGITAL_ARCHITECTURE_OMAS        (215,
-                                      ComponentDevelopmentStatus.TECHNICAL_PREVIEW,
+                                      ComponentDevelopmentStatus.STABLE,
                                       "Digital Architecture",
                                       "Digital Architecture OMAS",
                                       "digital-architecture",
@@ -223,7 +223,7 @@ public enum AccessServiceDescription implements Serializable
      * Manage the governance program.
      */
     GOVERNANCE_PROGRAM_OMAS          (220,
-                                      ComponentDevelopmentStatus.TECHNICAL_PREVIEW,
+                                      ComponentDevelopmentStatus.STABLE,
                                       "Governance Program",
                                       "Governance Program OMAS",
                                       "governance-program",
@@ -236,7 +236,7 @@ public enum AccessServiceDescription implements Serializable
      * Manage governance related projects.
      */
     PROJECT_MANAGEMENT_OMAS          (221,
-                                      ComponentDevelopmentStatus.IN_DEVELOPMENT,
+                                      ComponentDevelopmentStatus.TECHNICAL_PREVIEW,
                                       "Project Management",
                                       "Project Management OMAS",
                                       "project-management",
diff --git a/open-metadata-implementation/admin-services/admin-services-api/src/main/java/org/odpi/openmetadata/adminservices/configuration/registration/GovernanceServicesDescription.java b/open-metadata-implementation/admin-services/admin-services-api/src/main/java/org/odpi/openmetadata/adminservices/configuration/registration/GovernanceServicesDescription.java
index 4b9d4de3ef9..27e75834509 100644
--- a/open-metadata-implementation/admin-services/admin-services-api/src/main/java/org/odpi/openmetadata/adminservices/configuration/registration/GovernanceServicesDescription.java
+++ b/open-metadata-implementation/admin-services/admin-services-api/src/main/java/org/odpi/openmetadata/adminservices/configuration/registration/GovernanceServicesDescription.java
@@ -13,7 +13,7 @@ public enum GovernanceServicesDescription
      * Store and query asset lineage.
      */
     LINEAGE_WAREHOUSE_SERVICES(190,
-                               ComponentDevelopmentStatus.IN_DEVELOPMENT,
+                               ComponentDevelopmentStatus.TECHNICAL_PREVIEW,
                                "Lineage Warehouse Services",
                                "lineage-warehouse",
                                "Store and query asset lineage",
@@ -39,7 +39,7 @@ public enum GovernanceServicesDescription
      * Integrate Data Engines that are not self-capable of integrating directly with the Data Engine OMAS.
      */
     DATA_ENGINE_PROXY_SERVICES       (192,
-                                      ComponentDevelopmentStatus.IN_DEVELOPMENT,
+                                      ComponentDevelopmentStatus.DEPRECATED,
                                       "Data Engine Proxy Services",
                                       "data-engine-proxy",
                                       "Integrate Data Engines that are not self-capable of integrating directly with the Data Engine OMAS.",