diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml
index cce764ca..ae006280 100644
--- a/docker-compose/docker-compose.yaml
+++ b/docker-compose/docker-compose.yaml
@@ -272,31 +272,31 @@ services:
       - mariadb
       - crossbar
 
-  master-nonlatent:
-    image: quay.io/mariadb-foundation/bb-master:master
-    restart: unless-stopped
-    container_name: master-nonlatent
-    environment:
-      - MQ_ROUTER_URL
-      - TITLE_URL
-      - BUILDMASTER_URL
-      - TITLE
-      - PORT=10004
-    volumes:
-      - ./logs:/var/log/buildbot
-      - ./buildbot/:/srv/buildbot/master
-    entrypoint:
-      - /bin/bash
-      - -c
-      - "/srv/buildbot/master/docker-compose/start.sh master-nonlatent"
-    networks:
-      net_front:
-      net_back:
-    ports:
-      - "127.0.0.1:10004:10004"
-    depends_on:
-      - mariadb
-      - crossbar
+  # master-nonlatent:
+  #   image: quay.io/mariadb-foundation/bb-master:master
+  #   restart: unless-stopped
+  #   container_name: master-nonlatent
+  #   environment:
+  #     - MQ_ROUTER_URL
+  #     - TITLE_URL
+  #     - BUILDMASTER_URL
+  #     - TITLE
+  #     - PORT=10004
+  #   volumes:
+  #     - ./logs:/var/log/buildbot
+  #     - ./buildbot/:/srv/buildbot/master
+  #   entrypoint:
+  #     - /bin/bash
+  #     - -c
+  #     - "/srv/buildbot/master/docker-compose/start.sh master-nonlatent"
+  #   networks:
+  #     net_front:
+  #     net_back:
+  #   ports:
+  #     - "127.0.0.1:10004:10004"
+  #   depends_on:
+  #     - mariadb
+  #     - crossbar
 
   master-protected-branches:
     image: quay.io/mariadb-foundation/bb-master:master
diff --git a/docker-compose/generate-config.py b/docker-compose/generate-config.py
index a860f0f3..3800fa27 100755
--- a/docker-compose/generate-config.py
+++ b/docker-compose/generate-config.py
@@ -16,7 +16,7 @@
     "autogen/x86-master-0",
     "master-docker-nonstandard",
     "master-galera",
-    "master-nonlatent",
+    # "master-nonlatent",
 # TODO Enable this once it's more clear what needs to be done
 #    "master-libvirt",
     "master-protected-branches",