diff --git a/faf-extra.yml b/faf-extra.yml
index 34cc19c..5e46ffa 100644
--- a/faf-extra.yml
+++ b/faf-extra.yml
@@ -5,22 +5,6 @@ version: '3.7'
 
 services:
 
-  #
-  # Static copy of the old phpbb3 forum (https://forums.faforever.com)
-  #
-  phpbb3-archive:
-    image: nginx:1.25
-    restart: unless-stopped
-    volumes:
-      - ./config/extra/phpbb3-archive/:/etc/nginx/conf.d/
-      - ./data/phpbb3-archive/:/usr/share/nginx/html/
-    networks:
-      - faf-extra
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.faf-phpbb3-archive.rule=Host(`forums.${DOMAINNAME}`)"
-      - "traefik.http.routers.faf-phpbb3-archive.entryPoints=websecure"
-
   #
   # NoSQL database specifically used for nodebb
   #
@@ -55,48 +39,6 @@ services:
       - "traefik.http.routers.faf-nodebb.rule=Host(`forum.${DOMAINNAME}`)"
       - "traefik.http.routers.faf-nodebb.entryPoints=websecure"
 
-
-  #
-  # New Wiki software (not the same as Wikipedia)
-  #
-  wikijs:
-    image: requarks/wiki:2
-    restart: unless-stopped
-    networks:
-      - faf-extra
-    env_file: ./config/extra/wikijs/wikijs.env
-    volumes:
-      - ./data/wikijs/authentication/faf-hydra:/wiki/server/modules/authentication/faf-hydra:ro
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.wikijs.rule=Host(`wiki.${DOMAINNAME}`)"
-      - "traefik.http.routers.wikijs.entryPoints=websecure"
-      - "traefik.http.services.wikijs.loadbalancer.server.port=3000"
-
-  #
-  # Database used by Wiki.js
-  #
-  postgres-wikijs:
-    image: postgres:13-alpine
-    restart: unless-stopped
-    networks:
-      - faf-extra
-    env_file: ./config/extra/postgres-wikijs/postgres-wikijs.env
-    volumes:
-      - ./data/extra/postgres-wikijs:/var/lib/postgresql/data      
-
-  #
-  # QAI & Dostya combined
-  #
-  qai:
-    image: faforever/faf-qai:main
-    restart: unless-stopped
-    networks:
-      - faf
-    env_file: ./config/extra/qai/qai.env
-    volumes:
-      - ./data/qai/Database:/app/Database
-
 networks:
   faf-extra:
     driver: bridge
diff --git a/k8s-archive/faf-extra.yml b/k8s-archive/faf-extra.yml
index c6f3696..f4f465d 100644
--- a/k8s-archive/faf-extra.yml
+++ b/k8s-archive/faf-extra.yml
@@ -4,6 +4,21 @@
 version: '3.7'
 
 services:
+  #
+  # Static copy of the old phpbb3 forum (https://forums.faforever.com)
+  #
+  phpbb3-archive:
+    image: nginx:1.25
+    restart: unless-stopped
+    volumes:
+      - ./config/extra/phpbb3-archive/:/etc/nginx/conf.d/
+      - ./data/phpbb3-archive/:/usr/share/nginx/html/
+    networks:
+      - faf-extra
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.faf-phpbb3-archive.rule=Host(`forums.${DOMAINNAME}`)"
+      - "traefik.http.routers.faf-phpbb3-archive.entryPoints=websecure"
 
   #
   # FAF unit database
@@ -41,6 +56,48 @@ services:
       - "traefik.http.routers.faf-voting.entryPoints=websecure"
       - "traefik.http.services.faf-voting.loadbalancer.server.port=3000"
 
+
+  #
+  # New Wiki software (not the same as Wikipedia)
+  #
+  wikijs:
+    image: requarks/wiki:2
+    restart: unless-stopped
+    networks:
+      - faf-extra
+    env_file: ./config/extra/wikijs/wikijs.env
+    volumes:
+      - ./data/wikijs/authentication/faf-hydra:/wiki/server/modules/authentication/faf-hydra:ro
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.wikijs.rule=Host(`wiki.${DOMAINNAME}`)"
+      - "traefik.http.routers.wikijs.entryPoints=websecure"
+      - "traefik.http.services.wikijs.loadbalancer.server.port=3000"
+
+  #
+  # Database used by Wiki.js
+  #
+  postgres-wikijs:
+    image: postgres:13-alpine
+    restart: unless-stopped
+    networks:
+      - faf-extra
+    env_file: ./config/extra/postgres-wikijs/postgres-wikijs.env
+    volumes:
+      - ./data/extra/postgres-wikijs:/var/lib/postgresql/data
+
+  #
+  # QAI & Dostya combined
+  #
+  qai:
+    image: faforever/faf-qai:main
+    restart: unless-stopped
+    networks:
+      - faf
+    env_file: ./config/extra/qai/qai.env
+    volumes:
+      - ./data/qai/Database:/app/Database
+
 networks:
   faf-extra:
     driver: bridge