diff --git a/docker-compose.bibigrid.yml b/docker-compose.bibigrid.yml
index 2776cf12..752131aa 100644
--- a/docker-compose.bibigrid.yml
+++ b/docker-compose.bibigrid.yml
@@ -2,7 +2,7 @@ version: '3.5'
 services:
   simplevm-client:
     container_name: simplevm-client
-    image: denbicloud/simplevm-client:${CLOUD_PORTAL_CLIENT_TAG}
+    image: quay.io/denbicloud/simplevm-client:${CLOUD_PORTAL_CLIENT_TAG}
     ports:
       - ${CLIENT_PORT}:9090
     env_file:
diff --git a/docker-compose.yml b/docker-compose.yml
index 1566428a..c627038a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.5'
 services:
   simplevm-client:
     container_name: simplevm-client
-    image: denbicloud/simplevm-client:${CLOUD_PORTAL_CLIENT_TAG}
+    image: quay.io/denbicloud/simplevm-client:${CLOUD_PORTAL_CLIENT_TAG}
     ports:
       - ${CLIENT_PORT}:9090
     env_file:
diff --git a/plays/setup_basics.yml b/plays/setup_basics.yml
index 476ad2c5..349641f8 100644
--- a/plays/setup_basics.yml
+++ b/plays/setup_basics.yml
@@ -74,3 +74,10 @@
         images_filter:
           dangling: false
         networks: yes
+
+    - name: "Ensure the user {{ ansible_user }} is part of the docker group"
+      user:
+        name: "{{ ansible_user }}"
+        groups: docker
+        append: yes
+      tags: always