diff --git a/dev/docker/docker-compose-arm64.yml b/dev/docker/docker-compose-arm64.yml
index 4788406bb61651301f48b94daa050660ebc71899..b8c508e744de2da36982d4ff676a4dc392d11d77 100644
--- a/dev/docker/docker-compose-arm64.yml
+++ b/dev/docker/docker-compose-arm64.yml
@@ -7,42 +7,45 @@ volumes:
 
 services:
   keycloak:
-      image: richardjkendall/keycloak-arm:latest
-      hostname: keycloak
-      volumes:
-        - ${PWD}/realm-export.json:/export/realm-export.json
-      environment:
-        KEYCLOAK_USER: admin
-        KEYCLOAK_PASSWORD: admin
-        KEYCLOAK_IMPORT: /export/realm-export.json
-      ports:
-        - 8080:8080
-      restart: on-failure
-      healthcheck:
-        test: ["CMD", "curl", "-f", "http://localhost:8080/auth"]
-        interval: 30s
-        timeout: 3s
-        retries: 10
-        start_period: 5s
+    container_name: keycloak
+    image: richardjkendall/keycloak-arm:latest
+    hostname: keycloak
+    volumes:
+      - ${PWD}/realm-export.json:/export/realm-export.json
+    environment:
+      KEYCLOAK_USER: admin
+      KEYCLOAK_PASSWORD: admin
+      KEYCLOAK_IMPORT: /export/realm-export.json
+    ports:
+      - 8080:8080
+    restart: on-failure
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8080/auth"]
+      interval: 30s
+      timeout: 3s
+      retries: 10
+      start_period: 5s
   xrdp:
-      hostname: xrdp
-      image: rattydave/docker-ubuntu-xrdp-mate-custom:20.04
-      ports:
-        - 3389:3389
-      restart: on-failure
-      volumes:
-        - ${PWD}/xrdp_users.txt:/root/createusers.txt
-      environment:
-        TZ: "Europe/Amsterdam"
+    container_name: xrdp
+    hostname: xrdp
+    image: rattydave/docker-ubuntu-xrdp-mate-custom:20.04
+    ports:
+      - 3389:3389
+    restart: on-failure
+    volumes:
+      - ${PWD}/xrdp_users.txt:/root/createusers.txt
+    environment:
+      TZ: "Europe/Amsterdam"
   rdpgw:
-       build: .
-       ports:
-         - 9443:9443
-       restart: on-failure
-       depends_on:
-         - keycloak
-       healthcheck:
-         test: ["CMD", "curl", "-f", "http://keycloak:8080"]
-         interval: 30s
-         timeout: 10s
-         retries: 10
+    container_name: rdpgw
+    build: .
+    ports:
+      - 9443:9443
+    restart: on-failure
+    depends_on:
+      - keycloak
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://keycloak:8080"]
+      interval: 30s
+      timeout: 10s
+      retries: 10
diff --git a/dev/docker/docker-compose.yml b/dev/docker/docker-compose.yml
index 230d65b6a2095dc967fc55f8a5ab8009434bf902..8bc2fd8ec60044936161c80b2f99dde6e918a0ef 100644
--- a/dev/docker/docker-compose.yml
+++ b/dev/docker/docker-compose.yml
@@ -7,6 +7,7 @@ volumes:
 
 services:
   keycloak:
+      container_name: keycloak
       image: quay.io/keycloak/keycloak:latest
       hostname: keycloak
       volumes:
@@ -15,9 +16,13 @@ services:
         KEYCLOAK_USER: admin
         KEYCLOAK_PASSWORD: admin
         KEYCLOAK_IMPORT: /export/realm-export.json
+        KEYCLOAK_ADMIN: admin
+        KEYCLOAD_ADMIN_PASSWORD: admin
       ports:
         - 8080:8080
       restart: on-failure
+      command:
+        - start-dev
       healthcheck:
         test: ["CMD", "curl", "-f", "http://localhost:8080/auth"]
         interval: 30s
@@ -25,6 +30,7 @@ services:
         retries: 10
         start_period: 5s
   xrdp:
+      container_name: xrdp
       hostname: xrdp
       image: rattydave/docker-ubuntu-xrdp-mate-custom:20.04
       ports: