diff --git a/magnum/drivers/swarm_fedora_atomic_v2/templates/swarmmaster.yaml b/magnum/drivers/swarm_fedora_atomic_v2/templates/swarmmaster.yaml
index df2f243d0c8a5585ee30eec435c4df05ddba7215..f1eb338ccd3bc9b625c4c30e8aa9baeaf60619c4 100644
--- a/magnum/drivers/swarm_fedora_atomic_v2/templates/swarmmaster.yaml
+++ b/magnum/drivers/swarm_fedora_atomic_v2/templates/swarmmaster.yaml
@@ -192,7 +192,7 @@ resources:
             "$CVMFS_ENABLED": {get_param: cvmfs_enabled}
             "$CVMFS_TAG": {get_param: cvmfs_tag}
             "$CVMFS_STORAGE_DRIVER": {get_param: cvmfs_storage_driver}
-            "$DOCKER_CE": {get_param: docker_ce_version}
+            "$DOCKER_CE_VERSION": {get_param: docker_ce_version}
 
   remove_docker_key:
     type: "OS::Heat::SoftwareConfig"
@@ -303,13 +303,13 @@ resources:
         - config: {get_resource: configure_docker_storage}
         - config: {get_resource: add_docker_daemon_options}
         - config: {get_resource: write_docker_socket}
+        - config: {get_resource: configure_docker_ce_version}
         - config: {get_resource: add_proxy}
         - config: {get_resource: enable_services}
         - config: {get_resource: install_cern_certs}
         - config: {get_resource: write_swarm_master_service}
         - config: {get_resource: volume_service}
         - config: {get_resource: configure_docker_cvmfs}
-        - config: {get_resource: configure_docker_ce_version}
         - config: {get_resource: configure_docker_cvmfs_storage_driver}
         - config: {get_resource: configure_keytab}
 
diff --git a/magnum/drivers/swarm_fedora_atomic_v2/templates/swarmnode.yaml b/magnum/drivers/swarm_fedora_atomic_v2/templates/swarmnode.yaml
index d21ed159c7fa31734344aa1375ff3cf2fca159cc..f3d7e03d48edab28663a00a7b75f6e020766a34f 100644
--- a/magnum/drivers/swarm_fedora_atomic_v2/templates/swarmnode.yaml
+++ b/magnum/drivers/swarm_fedora_atomic_v2/templates/swarmnode.yaml
@@ -187,7 +187,7 @@ resources:
             "$CVMFS_ENABLED": {get_param: cvmfs_enabled}
             "$CVMFS_TAG": {get_param: cvmfs_tag}
             "$CVMFS_STORAGE_DRIVER": {get_param: cvmfs_storage_driver}
-            "$DOCKER_CE": {get_param: docker_ce_version}
+            "$DOCKER_CE_VERSION": {get_param: docker_ce_version}
 
   remove_docker_key:
     type: "OS::Heat::SoftwareConfig"
@@ -299,10 +299,10 @@ resources:
         - config: {get_resource: add_docker_daemon_options}
         - config: {get_resource: write_docker_socket}
         - config: {get_resource: add_proxy}
+        - config: {get_resource: configure_docker_ce_version}
         - config: {get_resource: enable_services}
         - config: {get_resource: install_cern_certs}
         - config: {get_resource: configure_docker_cvmfs}
-        - config: {get_resource: configure_docker_ce_version}
         - config: {get_resource: configure_docker_cvmfs_storage_driver}
         - config: {get_resource: write_swarm_worker_service}
         - config: {get_resource: volume_service}