diff --git a/bullseye-metamod/Dockerfile b/bullseye-metamod/Dockerfile
deleted file mode 100644
index 26eebf9..0000000
--- a/bullseye-metamod/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM cm2network/tf2:base
-
-ENV METAMOD_VERSION 1.11
-
-# All other properties are inherited from the base image
diff --git a/bullseye-sourcemod/Dockerfile b/bullseye-sourcemod/Dockerfile
deleted file mode 100644
index 5a2f658..0000000
--- a/bullseye-sourcemod/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM cm2network/tf2:base
-
-ENV METAMOD_VERSION 1.11
-ENV SOURCEMOD_VERSION 1.11
-
-# All other properties are inherited from the base image
diff --git a/bullseye/Dockerfile b/bullseye/Dockerfile
index 9bb684e..5e69739 100644
--- a/bullseye/Dockerfile
+++ b/bullseye/Dockerfile
@@ -1,7 +1,7 @@
 ###########################################################
 # Dockerfile that builds a TF2 Gameserver
 ###########################################################
-FROM cm2network/steamcmd:root
+FROM cm2network/steamcmd:root AS build_stage
 
 LABEL maintainer="walentinlamonos@gmail.com"
 
@@ -18,11 +18,11 @@ RUN set -x \
 	&& apt-get install -y --no-install-recommends --no-install-suggests \
 		wget=1.21-1+deb11u1 \
 		ca-certificates=20210119 \
-		lib32z1=1:1.2.11.dfsg-2+deb11u1 \
+		lib32z1=1:1.2.11.dfsg-2+deb11u2 \
 		libncurses5:i386=6.2+20201114-2 \
 		libbz2-1.0:i386=1.0.8-4 \
 		libtinfo5:i386=6.2+20201114-2 \
-		libcurl3-gnutls:i386=7.74.0-1.3+deb11u1 \
+		libcurl3-gnutls:i386=7.74.0-1.3+deb11u3 \
 	&& mkdir -p "${STEAMAPPDIR}" \
 	# Add entry script
 	&& wget "${DLURL}/master/etc/entry.sh" -O "${HOMEDIR}/entry.sh" \
@@ -40,6 +40,8 @@ RUN set -x \
 	# Clean up
 	&& rm -rf /var/lib/apt/lists/*
 
+FROM build_stage AS bullseye-base
+
 ENV SRCDS_FPSMAX=300 \
 	SRCDS_TICKRATE=66 \
 	SRCDS_PORT=27015 \
@@ -68,3 +70,11 @@ CMD ["bash", "entry.sh"]
 EXPOSE 27015/tcp \
 	27015/udp \
 	27020/udp
+
+FROM bullseye-base AS bullseye-metamod
+
+ENV METAMOD_VERSION 1.11
+
+FROM bullseye-metamod AS bullseye-sourcemod
+
+ENV SOURCEMOD_VERSION 1.11
diff --git a/bullseye/hooks/build b/bullseye/hooks/build
new file mode 100644
index 0000000..fa67017
--- /dev/null
+++ b/bullseye/hooks/build
@@ -0,0 +1,6 @@
+#!/bin/bash
+BUILD_PATH=$(echo ${DOCKERFILE_PATH}| sed 's#/#..#g' | sed 's#[a-zA-Z0-9]\+#/#g' | cut -c 2- )
+ 
+docker build --target=bullseye-base -f $(basename ${DOCKERFILE_PATH}) -t $DOCKER_REPO:latest -t $DOCKER_REPO:base ${BUILD_PATH}.
+docker build --target=bullseye-metamod -f $(basename ${DOCKERFILE_PATH}) -t $DOCKER_REPO:metamod ${BUILD_PATH}.
+docker build --target=bullseye-sourcemod -f $(basename ${DOCKERFILE_PATH}) -t $DOCKER_REPO:sourcemod ${BUILD_PATH}.
diff --git a/bullseye/hooks/push b/bullseye/hooks/push
new file mode 100644
index 0000000..93a8d0d
--- /dev/null
+++ b/bullseye/hooks/push
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker push --all-tags ${DOCKER_REPO}