diff --git a/deployment_files/global/v1.0demo/software/charts/ucp/core/mariadb.yaml b/deployment_files/global/v1.0demo/software/charts/ucp/core/mariadb.yaml
index e938b703..82be2846 100644
--- a/deployment_files/global/v1.0demo/software/charts/ucp/core/mariadb.yaml
+++ b/deployment_files/global/v1.0demo/software/charts/ucp/core/mariadb.yaml
@@ -30,7 +30,7 @@ metadata:
         name: ucp_endpoints
         path: .ucp.oslo_db
       dest:
-        path: .values.endpoints.olso_db
+        path: .values.endpoints.oslo_db
     # Accounts
     - src:
         schema: pegleg/AccountCatalogue/v1
diff --git a/deployment_files/global/v1.0demo/software/charts/ucp/shipyard/shipyard.yaml b/deployment_files/global/v1.0demo/software/charts/ucp/shipyard/shipyard.yaml
index 5254acd9..4983da16 100644
--- a/deployment_files/global/v1.0demo/software/charts/ucp/shipyard/shipyard.yaml
+++ b/deployment_files/global/v1.0demo/software/charts/ucp/shipyard/shipyard.yaml
@@ -78,9 +78,9 @@ metadata:
     - src:
         schema: pegleg/EndpointCatalogue/v1
         name: ucp_endpoints
-        path: .ucp.oslo_messaging
+        path: .ucp.airflow_oslo_messaging
       dest:
-        path: .values.endpoints.olso_messaging
+        path: .values.endpoints.oslo_messaging
     - src:
         schema: pegleg/EndpointCatalogue/v1
         name: ucp_endpoints
diff --git a/deployment_files/global/v1.0demo/software/config/endpoints.yaml b/deployment_files/global/v1.0demo/software/config/endpoints.yaml
index d6cbf1bb..7f4d8783 100644
--- a/deployment_files/global/v1.0demo/software/config/endpoints.yaml
+++ b/deployment_files/global/v1.0demo/software/config/endpoints.yaml
@@ -94,6 +94,19 @@ data:
         api:
           default: 9311
           public: 80
+    airflow_oslo_messaging:
+      namespace: null
+      hosts:
+        default: rabbitmq
+      host_fqdn_override:
+        default: null
+      path: /airflow
+      scheme: amqp
+      port:
+        amqp:
+          default: 5672
+        http:
+          default: 15672
     oslo_messaging:
       namespace: null
       hosts:
diff --git a/deployment_files/global/v1.0dev/software/charts/ucp/core/mariadb.yaml b/deployment_files/global/v1.0dev/software/charts/ucp/core/mariadb.yaml
index ff6bb457..6b48c7db 100644
--- a/deployment_files/global/v1.0dev/software/charts/ucp/core/mariadb.yaml
+++ b/deployment_files/global/v1.0dev/software/charts/ucp/core/mariadb.yaml
@@ -30,7 +30,7 @@ metadata:
         name: ucp_endpoints
         path: .ucp.oslo_db
       dest:
-        path: .values.endpoints.olso_db
+        path: .values.endpoints.oslo_db
     # Accounts
     - src:
         schema: pegleg/AccountCatalogue/v1
diff --git a/deployment_files/global/v1.0dev/software/charts/ucp/shipyard/shipyard.yaml b/deployment_files/global/v1.0dev/software/charts/ucp/shipyard/shipyard.yaml
index 5254acd9..4983da16 100644
--- a/deployment_files/global/v1.0dev/software/charts/ucp/shipyard/shipyard.yaml
+++ b/deployment_files/global/v1.0dev/software/charts/ucp/shipyard/shipyard.yaml
@@ -78,9 +78,9 @@ metadata:
     - src:
         schema: pegleg/EndpointCatalogue/v1
         name: ucp_endpoints
-        path: .ucp.oslo_messaging
+        path: .ucp.airflow_oslo_messaging
       dest:
-        path: .values.endpoints.olso_messaging
+        path: .values.endpoints.oslo_messaging
     - src:
         schema: pegleg/EndpointCatalogue/v1
         name: ucp_endpoints
diff --git a/deployment_files/global/v1.0dev/software/config/endpoints.yaml b/deployment_files/global/v1.0dev/software/config/endpoints.yaml
index 5cf471b5..072a8f4d 100644
--- a/deployment_files/global/v1.0dev/software/config/endpoints.yaml
+++ b/deployment_files/global/v1.0dev/software/config/endpoints.yaml
@@ -92,6 +92,19 @@ data:
         api:
           default: 9311
           public: 80
+    airflow_oslo_messaging:
+      namespace: null
+      hosts:
+        default: rabbitmq
+      host_fqdn_override:
+        default: null
+      path: /airflow
+      scheme: amqp
+      port:
+        amqp:
+          default: 5672
+        http:
+          default: 15672
     oslo_messaging:
       namespace: null
       hosts: