diff --git a/docker/services/database/mongodb.yaml b/docker/services/database/mongodb.yaml
index 9b5c5b8f27..d6bba20bca 100644
--- a/docker/services/database/mongodb.yaml
+++ b/docker/services/database/mongodb.yaml
@@ -157,6 +157,10 @@ outputs:
       metadata_settings:
         get_attr: [MongodbPuppetBase, role_data, metadata_settings]
       upgrade_tasks:
+        - name: Check for mongodb service
+          stat: path=/usr/lib/systemd/system/mongod.service
+          register: mongod_service
         - name: Stop and disable mongodb service
           tags: step2
           service: name=mongod state=stopped enabled=no
+          when: mongod_service.stat.exists
diff --git a/environments/docker.yaml b/environments/docker.yaml
index dfa30b0893..67e8a496d8 100644
--- a/environments/docker.yaml
+++ b/environments/docker.yaml
@@ -30,7 +30,6 @@ resource_registry:
   OS::TripleO::Services::HAproxy: ../docker/services/haproxy.yaml
   OS::TripleO::Services::MySQL: ../docker/services/database/mysql.yaml
   OS::TripleO::Services::RabbitMQ: ../docker/services/rabbitmq.yaml
-  OS::TripleO::Services::MongoDb: ../docker/services/database/mongodb.yaml
   OS::TripleO::Services::Redis: ../docker/services/database/redis.yaml
   OS::TripleO::Services::Memcached: ../docker/services/memcached.yaml
   OS::TripleO::Services::SwiftProxy: ../docker/services/swift-proxy.yaml
diff --git a/puppet/services/disabled/mongodb-disabled.yaml b/puppet/services/disabled/mongodb-disabled.yaml
index 9e58103c89..c01a91fbce 100644
--- a/puppet/services/disabled/mongodb-disabled.yaml
+++ b/puppet/services/disabled/mongodb-disabled.yaml
@@ -37,6 +37,10 @@ outputs:
     value:
       service_name: mongodb_disabled
       upgrade_tasks:
+        - name: Check for mongodb service
+          stat: path=/usr/lib/systemd/system/mongod.service
+          register: mongod_service
         - name: Stop and disable mongodb service on upgrade
           tags: step1
           service: name=mongod state=stopped enabled=no
+          when: mongod_service.stat.exists