diff --git a/scripts/build-container b/scripts/build-container
index c1df8b4..74afab5 100755
--- a/scripts/build-container
+++ b/scripts/build-container
@@ -37,7 +37,8 @@ chomp($git_commit_sha);
 # ---------------------------------------------------------------------------
 my $container_registry = $ENV{'CONTAINER_REGISTRY'} || 'gitea.badhouseplants.net';
 my $image_name = $ENV{'PACKAGE_NAME'} | $ENV{'DRONE_REPO'} || "badhouseplants/badhouseplants-net";
-my $tag = "$container_registry/$image_name:$git_commit_sha";
+my $version = $ENV{'CI_COMMIT_TAG'} | $ENV{'CI_COMMIT_SHA'} | $git_commit_sha;
+my $tag = "$container_registry/$image_name:$version";
 my $custom_tag = $ENV{'CUSTOM_TAG'} || "";
 my $skip_sha_push = $ENV{'SKIP_SHA_PUSH'} || "";
 my $username = "woody";