diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7805e8e..4dc0fb0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,8 @@ dev-watchdog:
   tags:
    - docker
   script:
-    - make watchdog-nopush
+    - cd watchdog
+    - make nopush
   only:
     variables:
       - $CI_COMMIT_REF_PROTECTED == "false"
@@ -22,7 +23,8 @@ watchdog:
   tags:
    - docker
   script:
-    - make watchdog
+    - cd watchdog
+    - make push
   only:
     variables:
       - $CI_COMMIT_REF_PROTECTED == "true"
@@ -32,7 +34,8 @@ dev-unifi:
   tags:
    - docker
   script:
-    - make unifi-nopush
+    - cd unifi
+    - make nopush
   only:
     variables:
       - $CI_COMMIT_REF_PROTECTED == "false"
@@ -42,27 +45,8 @@ unifi:
   tags:
    - docker
   script:
-    - make unifi
-  only:
-    variables:
-      - $CI_COMMIT_REF_PROTECTED == "true"
-
-dev-mc:
-  stage: build
-  tags:
-   - docker
-  script:
-    - make mc-nopush
-  only:
-    variables:
-      - $CI_COMMIT_REF_PROTECTED == "false"
-
-mc:
-  stage: build
-  tags:
-   - docker
-  script:
-    - make mc
+    - cd unifi
+    - make push
   only:
     variables:
       - $CI_COMMIT_REF_PROTECTED == "true"
@@ -72,7 +56,8 @@ dev-keycloak:
   tags:
    - docker
   script:
-    - make keycloak-nopush
+    - cd keycloak
+    - make nopush
   only:
     variables:
       - $CI_COMMIT_REF_PROTECTED == "false"
@@ -82,7 +67,8 @@ keycloak:
   tags:
    - docker
   script:
-    - make keycloak
+    - cd keycloak
+    - make push
   only:
     variables:
       - $CI_COMMIT_REF_PROTECTED == "true"
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 363c391..0000000
--- a/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-.DEFAULT: all
-.PHONY: mc keycloak pgadmin4 unifi watchdog
-
-all: mc keycloak pgadmin4 unifi
-
-include */Makefile
-
diff --git a/debian.version b/debian.version
deleted file mode 100644
index 2f14c56..0000000
--- a/debian.version
+++ /dev/null
@@ -1 +0,0 @@
-DEBIAN_VERSION=stable-20200607-slim
diff --git a/keycloak/Dockerfile b/keycloak/Dockerfile
index 9d5ad12..61c8e7d 100644
--- a/keycloak/Dockerfile
+++ b/keycloak/Dockerfile
@@ -2,12 +2,16 @@ FROM debian:buster-20200803-slim
 ADD https://curl.haxx.se/ca/cacert.pem /etc/ssl/certs/cacert.pem
 ENV CURL_CA_BUNDLE=/etc/ssl/certs/cacert.pem
 
-ARG KEYCLOAK_VERSION
+ARG VERSION
 ENV KEYCLOAK_VERSION $KEYCLOAK_VERSION
-ENV JDBC_POSTGRES_VERSION 42.2.14
+# https://jdbc.postgresql.org/download.html
+ENV JDBC_POSTGRES_VERSION 42.2.16
+# https://dev.mysql.com/downloads/connector/j/
 ENV JDBC_MYSQL_VERSION 8.0.21
+# https://github.com/mariadb-corporation/mariadb-connector-j/releases
 ENV JDBC_MARIADB_VERSION 2.6.2
-ENV JDBC_MSSQL_VERSION 8.4.0.jre11
+# https://docs.microsoft.com/en-us/sql/connect/jdbc/microsoft-jdbc-driver-for-sql-server-support-matrix?view=sql-server-ver15
+ENV JDBC_MSSQL_VERSION 8.4.1.jre11
 
 ENV LAUNCH_JBOSS_IN_BACKGROUND 1
 ENV PROXY_ADDRESS_FORWARDING false
diff --git a/keycloak/Makefile b/keycloak/Makefile
index dde01c1..4328d40 100644
--- a/keycloak/Makefile
+++ b/keycloak/Makefile
@@ -1,13 +1,17 @@
-include keycloak/keycloak.version
+NAMESPACE=alemairebe
+include version
 
-keycloak-nopush:
+IMAGE=keycloak
+
+nopush:
 	docker buildx build --platform linux/amd64 --load \
-	    --build-arg KEYCLOAK_VERSION=$(KEYCLOAK_VERSION) \
-	    --tag alemairebe/keycloak:$(KEYCLOAK_VERSION) keycloak
+	    --build-arg VERSION=$(VERSION) \
+	    --tag ${NAMESPACE}/${IMAGE}:$(VERSION) .
 
-keycloak:
+push:
 	docker buildx build --platform linux/amd64,linux/arm64,linux/arm --push \
-	    --build-arg KEYCLOAK_VERSION=$(KEYCLOAK_VERSION) \
-	    --cache-from=type=registry,ref=alemairebe/keycloak \
-	    --cache-to=type=registry,ref=alemairebe/keycloak \
-	    --tag alemairebe/keycloak:$(KEYCLOAK_VERSION) keycloak
+	    --build-arg VERSION=$(VERSION) \
+  	    --cache-from=type=registry,ref=${namespace}/buildx:${IMAGE} \
+	    --cache-to=type=registry,ref=${namespace}/buildx:${IMAGE} \
+	    --tag ${NAMESPACE}/${IMAGE}:$(VERSION) .
+
diff --git a/keycloak/keycloak.version b/keycloak/keycloak.version
deleted file mode 100644
index 4e2a0e2..0000000
--- a/keycloak/keycloak.version
+++ /dev/null
@@ -1 +0,0 @@
-KEYCLOAK_VERSION=11.0.0
diff --git a/keycloak/version b/keycloak/version
new file mode 100644
index 0000000..de738b0
--- /dev/null
+++ b/keycloak/version
@@ -0,0 +1 @@
+KEYCLOAK_VERSION=11.0.2
diff --git a/mc/Dockerfile b/mc/Dockerfile
deleted file mode 100644
index 506db75..0000000
--- a/mc/Dockerfile
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM debian:stable-20200720-slim
-ARG TARGETARCH
-ARG MC_VERSION
-ADD https://dl.min.io/client/mc/release/linux-${TARGETARCH}/archive/mc.${MC_VERSION} /root/
-RUN mv /root/mc.${MC_VERSION} /usr/bin/mc && chmod +x /usr/bin/mc
-
-FROM scratch
-COPY --from=0 /usr/bin/mc /mc
-ENTRYPOINT ["/mc"]
diff --git a/mc/Makefile b/mc/Makefile
deleted file mode 100644
index 6a9d50a..0000000
--- a/mc/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-include mc/mc.version
-
-mc-nopush:
-	docker buildx build --platform linux/amd64 --load \
-	    --build-arg MC_VERSION=$(MC_VERSION) \
-	    --tag alemairebe/mc:$(MC_VERSION) mc
-
-mc:
-	docker buildx build --platform linux/amd64,linux/arm64,linux/arm,linux/ppc64le --push \
-	    --build-arg MC_VERSION=$(MC_VERSION) \
-	    --cache-from=type=registry,ref=alemairebe/mc \
-	    --cache-to=type=registry,ref=alemairebe/mc \
-	    --tag alemairebe/mc:$(MC_VERSION) mc
diff --git a/mc/mc.version b/mc/mc.version
deleted file mode 100644
index b5c45fb..0000000
--- a/mc/mc.version
+++ /dev/null
@@ -1 +0,0 @@
-MC_VERSION=RELEASE.2020-07-17T02-52-20Z
diff --git a/unifi/Makefile b/unifi/Makefile
index 62c4fff..26ded05 100644
--- a/unifi/Makefile
+++ b/unifi/Makefile
@@ -1,15 +1,18 @@
-include unifi/.version
+NAMESPACE=alemairebe
+include version
 
-unifi-nopush:
+IMAGE=unifi
+
+nopush:
 	docker buildx build --platform linux/amd64 --load \
 	    --build-arg VERSION=$(VERSION) \
 	    --build-arg UNIFI_VERSION=$(UNIFI_VERSION) \
-	    --tag alemairebe/unifi:$(VERSION) unifi
+	    --tag ${NAMESPACE}/${IMAGE}:$(VERSION) .
 
-unifi:
+push:
 	docker buildx build --platform linux/amd64,linux/arm64 --push \
 	    --build-arg VERSION=$(VERSION) \
 	    --build-arg UNIFI_VERSION=$(UNIFI_VERSION) \
-	    --cache-from=type=registry,ref=alemairebe/unifi:buildx \
-	    --cache-to=type=registry,ref=alemairebe/unifi:buildx \
-	    --tag alemairebe/unifi:$(VERSION) unifi
+	    --cache-from=type=registry,ref=${namespace}/buildx:${IMAGE} \
+	    --cache-to=type=registry,ref=${namespace}/buildx:${IMAGE} \
+	    --tag ${NAMESPACE}/${IMAGE}:$(VERSION) .
diff --git a/unifi/.version b/unifi/version
similarity index 100%
rename from unifi/.version
rename to unifi/version
diff --git a/watchdog/Makefile b/watchdog/Makefile
index 7a38218..9cce4b6 100644
--- a/watchdog/Makefile
+++ b/watchdog/Makefile
@@ -1,13 +1,18 @@
-include watchdog/.version
+NAMESPACE=alemairebe
+include version
 
-watchdog-nopush:
+IMAGE=watchdog
+
+nopush:
 	docker buildx build --platform linux/amd64 --load \
 	    --build-arg VERSION=$(VERSION) \
-	    --tag alemairebe/watchdog:$(VERSION) watchdog
+    	    --tag ${NAMESPACE}/${IMAGE}:$(VERSION) .
 
-watchdog:
+
+push:
 	docker buildx build --platform linux/amd64,linux/arm64,linux/arm,linux/ppc64le --push \
 	    --build-arg VERSION=$(VERSION) \
-	    --cache-from=type=registry,ref=alemairebe/watchdog \
-	    --cache-to=type=registry,ref=alemairebe/watchdog \
-	    --tag alemairebe/watchdog:$(VERSION) watchdog
+    	    --cache-from=type=registry,ref=${namespace}/buildx:${IMAGE} \
+	    --cache-to=type=registry,ref=${namespace}/buildx:${IMAGE} \
+	    --tag ${NAMESPACE}/${IMAGE}:$(VERSION) .
+
diff --git a/watchdog/.version b/watchdog/version
similarity index 100%
rename from watchdog/.version
rename to watchdog/version