diff --git a/setup.py b/setup.py
index 6a931a6..58ffb52 100644
--- a/setup.py
+++ b/setup.py
@@ -16,4 +16,5 @@ import setuptools
 
 setuptools.setup(
     setup_requires=['pbr'],
+    py_modules=[],
     pbr=True)
diff --git a/tasks/docker.yml b/tasks/docker.yml
index 5d8bb33..feee550 100644
--- a/tasks/docker.yml
+++ b/tasks/docker.yml
@@ -183,6 +183,7 @@
           retries: 10
           delay: 5
           until: docker_ready.rc == 0
+          changed_when: false
 
     - name: mark docker configured
       lineinfile:
diff --git a/tasks/registry-login.yml b/tasks/registry-login.yml
index 472a4b6..e5269ff 100644
--- a/tasks/registry-login.yml
+++ b/tasks/registry-login.yml
@@ -19,6 +19,7 @@
          --password "{{ lookup('dict', item.value).value  }}"
       loop: "{{ query('dict', container_registry_logins | default({})) }}"
       register: registry_login_docker
+      changed_when: false
   rescue:
     - name: Failed login
       debug:
diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
deleted file mode 100644
index 4351480..0000000
--- a/zuul.d/base.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-- job:
-    description: Base ansible-role-container-registry job
-    name: ansible-role-container-registry-centos-7-base
-    nodeset: centos-7
-    parent: base
-    pre-run:
-    - zuul.d/playbooks/pre.yml
-    timeout: 1800
-    voting: true
-- job:
-    description: Run molecule testing
-    name: ansible-role-container-registry-centos-7-molecule
-    parent: ansible-role-container-registry-centos-7-base
-    run:
-    - zuul.d/playbooks/run.yml
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 0a405ec..e192004 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -1,14 +1,10 @@
 - project:
     check:
       jobs:
-        - ansible-role-container-registry-centos-7-molecule
         - openstack-tox-linters
-        - tripleo-ci-centos-7-undercloud-containers
     gate:
       jobs:
-        - ansible-role-container-registry-centos-7-molecule
         - openstack-tox-linters
-        - tripleo-ci-centos-7-undercloud-containers
     post:
       jobs:
         - publish-openstack-python-branch-tarball