diff --git a/X11Web/Dockerfile b/X11Web/Dockerfile
index 95d75bb398d73294d52d81a701307129cda568ca..7d58cca1a5cfbfe58c0ef99e4728b38ef22f18ec 100644
--- a/X11Web/Dockerfile
+++ b/X11Web/Dockerfile
@@ -8,7 +8,8 @@ USER root
 # Supervisord
 #------------------------
 
-# In this container we need to use supervisord as we have two servoces (VNC and noVNC)
+# In this container we need to use supervisord as we have two services (VNC and noVNC)
+RUN apt-get install supervisor -y
 
 # Supervisord conf
 COPY files/supervisord.conf /etc/supervisor/
diff --git a/base/Dockerfile b/base/Dockerfile
index f79ffb4a18b474d7f81e6c3ac41c00a288062826..95de2fc0b546f472ad7b92dc501cef67236b208f 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -12,18 +12,21 @@ ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get update
 
 # Utilities
-RUN apt-get install -y nano telnet unzip wget supervisor build-essential python-dev git-core openjdk-8-jre
+RUN apt-get install -y nano telnet unzip wget git-core
 
+# Change APT user to allow some container runtimes properly work (i.e. Podman)
+RUN groupadd -g 600 _apt
+RUN usermod -g 600 _apt
 
 #------------------------
 # "Meta" user
 #------------------------
 
-# Add group. We chose GID 65527 to try avoiding conflicts.
-RUN groupadd -g 65527 metauser
+# Add group. We chose GID 1000 as default.
+RUN groupadd -g 1000 metauser
 
-# Add user. We chose UID 65527 to try avoiding conflicts.
-RUN useradd metauser -d /home/metauser -u 65527 -g 65527 -m -s /bin/bash
+# Add user. We chose UID 1000 as default
+RUN useradd metauser -d /home/metauser -u 1000 -g 1000 -m -s /bin/bash
 
 # Add metuaser user to sudoers
 RUN adduser metauser sudo