diff --git a/docker/build/bin/run b/docker/build/bin/run
index ffbb6c2acd..1e41588765 100755
--- a/docker/build/bin/run
+++ b/docker/build/bin/run
@@ -15,11 +15,6 @@ args = sys.argv[1:]
 has_docker = os.path.exists('/var/run/docker.sock')
 docker_group_id = os.stat('/var/run/docker.sock').st_gid if has_docker else -1
 
-try:
-    subprocess.check_call(['groupadd', '--gid=' + os.environ['GROUP_ID'], 'geomapfish'])
-except subprocess.CalledProcessError:
-    pass
-
 if has_docker:
     try:
         subprocess.check_call(['groupdel', 'docker'])
@@ -27,6 +22,11 @@ if has_docker:
     except subprocess.CalledProcessError:
         pass
 
+try:
+    subprocess.check_call(['groupadd', '--gid=' + os.environ['GROUP_ID'], 'geomapfish'])
+except subprocess.CalledProcessError:
+    pass
+
 try:
     subprocess.check_call([
         'useradd',