diff --git a/Dockerfile b/Dockerfile
index 754ffa0..9ca8447 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,11 +12,10 @@
 #   - Ex: hexpm/elixir:1.15.0-erlang-26.0.1-debian-bullseye-20230522-slim
 ARG ELIXIR_VERSION=1.15.2
 ARG OTP_VERSION=26.0.2
-
-ARG DEBIAN_VERSION=bullseye-20230612-slim
-
-ARG BUILDER_IMAGE="hexpm/elixir:${ELIXIR_VERSION}-erlang-${OTP_VERSION}-debian-${DEBIAN_VERSION}"
-ARG RUNNER_IMAGE="debian:${DEBIAN_VERSION}"
+ARG OS_NAME=debian
+ARG OS_VER=bullseye-20230612-slim
+ARG BUILDER_IMAGE="hexpm/elixir:${ELIXIR_VERSION}-erlang-${OTP_VERSION}-${OS_NAME}-${OS_VER}"
+ARG RUNNER_IMAGE="${OS_NAME}:${OS_VER}"
 
 FROM ${BUILDER_IMAGE} as builder