diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b8b2d3a..66d6907 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,9 +36,7 @@ build:
             --context $CI_PROJECT_DIR \
             --dockerfile $CI_PROJECT_DIR/Containerfile \
             --destination "${CI_REGISTRY_IMAGE}:${IMAGE_TAG}" \
-            --build-arg "BASE_TAG=$BASE_TAG" \
-            --build-arg "FLAVOR=$FLAVOR" \
+            --label "org.opencontainers.image.source=${CI_PROJECT_URL}" \
             --label "org.opencontainers.image.revision=$CI_COMMIT_SHA" \
-            --label "org.opencontainers.artifact.created=$CI_JOB_STARTED_AT" \
             --label "org.opencontainers.image.created=$CI_JOB_STARTED_AT" \
             --label "org.opencontainers.image.version=${IMAGE_TAG}"
diff --git a/Containerfile b/Containerfile
index 2ae5421..45be2a5 100644
--- a/Containerfile
+++ b/Containerfile
@@ -6,15 +6,7 @@
 # https://docs.gitlab.com/runner/executors/docker.html#use-podman-to-run-docker-commands
 #
 
-ARG BASE_REPO="quay.io"
-ARG BASE_NS="podman"
-ARG BASE_NAME="stable"
-ARG BASE_TAG="v4.3.1"
-FROM $BASE_REPO/$BASE_NS/$BASE_NAME:$BASE_TAG
-# Metadata to identify the base-image FQIN
-LABEL org.opencontainers.image.base.name="$BASE_REPO/$BASE_NS/$BASE_NAME:$BASE_TAG"
-# Identify the repository source for the image.
-LABEL org.opencontainers.image.source="https://gitlab.com/qontainers/pipglr"
+FROM quay.io/podman/stable:v4.3.1
 
 # This is a list of packages to remove and/or exclude from the image.
 # Primarily this is done for security reasons, should a runner process