diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index f154381..ed8599e 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -44,6 +44,5 @@
     # aptly
     docker_image_aptly:
       base: "${_param:mcp_docker_registry}/mirantis/cicd/aptly:${_param:mcp_version}"
-      api: "${_param:mcp_docker_registry}/mirantis/cicd/aptly-api:${_param:mcp_version}"
       public: "${_param:mcp_docker_registry}/mirantis/cicd/aptly-public:${_param:mcp_version}"
       publisher: "${_param:mcp_docker_registry}/mirantis/cicd/aptly-publisher:${_param:mcp_version}"
diff --git a/docker/swarm/stack/aptly.yml b/docker/swarm/stack/aptly.yml
index d5b8362..3282641 100644
--- a/docker/swarm/stack/aptly.yml
+++ b/docker/swarm/stack/aptly.yml
@@ -16,7 +16,8 @@
               deploy:
                 restart_policy:
                   condition: any
-              image: ${_param:docker_image_aptly:api}
+              image: ${_param:docker_image_aptly:base}
+              command: 'aptly api serve -no-lock'
               ports:
                 - 18084:8080
               volumes:
diff --git a/keystone/server/cluster.yml b/keystone/server/cluster.yml
index 95884e7..d64a6cb 100644
--- a/keystone/server/cluster.yml
+++ b/keystone/server/cluster.yml
@@ -34,13 +34,14 @@
       admin_password: ${_param:keystone_admin_password}
       admin_email: ${_param:admin_email}
       role: ${_param:openstack_node_role}
+      admin_region: ${_param:openstack_region}
+      region: ${_param:openstack_region}
       bind:
         address: ${_param:cluster_local_address}
         private_address: ${_param:cluster_vip_address}
         private_port: 35357
         public_address: ${_param:cluster_vip_address}
         public_port: 5000
-      region: ${_param:openstack_region}
       database:
         engine: mysql
         host: ${_param:openstack_database_address}
diff --git a/keystone/server/single.yml b/keystone/server/single.yml
index c792bf5..6996968 100644
--- a/keystone/server/single.yml
+++ b/keystone/server/single.yml
@@ -33,13 +33,14 @@
       admin_password: ${_param:keystone_admin_password}
       admin_email: ${_param:admin_email}
       role: ${_param:openstack_node_role}
+      admin_region: ${_param:openstack_region}
+      region: ${_param:openstack_region}
       bind:
         address: ${_param:single_address}
         private_address: ${_param:single_address}
         private_port: 35357
         public_address: ${_param:single_address}
         public_port: 5000
-      region: ${_param:openstack_region}
       database:
         engine: mysql
         host: ${_param:single_address}
diff --git a/salt/minion/cert/vnc/novncproxy_server.yml b/salt/minion/cert/vnc/novncproxy_server.yml
index a9f0062..68152d4 100644
--- a/salt/minion/cert/vnc/novncproxy_server.yml
+++ b/salt/minion/cert/vnc/novncproxy_server.yml
@@ -19,7 +19,7 @@
             DNS:${_param:cluster_local_address},
             DNS:${linux:system:name},
             DNS:${_param:cluster_vip_address},
-            DNS:${linux:network:fqdn}
+            DNS:${linux:network:fqdn},
             DNS:${_param:openstack_service_host}
           key_usage: "digitalSignature,nonRepudiation,keyEncipherment"
           key_file: ${_param:novncproxy_server_ssl_key_file}