diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index 74861ca..c835595 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -69,7 +69,7 @@ dockers_v2:
       "classification": "UNCLASSIFIED"
       "org.opencontainers.image.created": "{{.Date}}"
       "org.opencontainers.image.description": "Hauler: Airgap Swiss Army Knife"
-      "org.opencontainers.image.name": "{{.ProjectName}}-debug"
+      "org.opencontainers.image.name": "{{.ProjectName}}"
       "org.opencontainers.image.revision": "{{.FullCommit}}"
       "org.opencontainers.image.source": "{{.GitURL}}"
       "org.opencontainers.image.version": "{{.Version}}"
diff --git a/Dockerfile b/Dockerfile
index 6967a71..a5fc9ea 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # builder stage
-FROM registry.suse.com/bci/bci-base:15.7 AS builder
+FROM registry.suse.com/bci/bci-base:16.1 AS builder
 ARG TARGETPLATFORM
 
 # fetched from goreleaser build process
@@ -29,7 +29,7 @@ USER hauler
 ENTRYPOINT [ "/hauler" ]
 
 # debug stage
-FROM alpine AS debug
+FROM registry.suse.com/bci/bci-base:16.1 AS debug
 
 COPY --from=builder /var/lib/ca-certificates/ca-bundle.pem /etc/ssl/certs/ca-certificates.crt
 COPY --from=builder /etc/passwd /etc/passwd
@@ -37,7 +37,5 @@ COPY --from=builder /etc/group /etc/group
 COPY --from=builder --chown=hauler:hauler /home/hauler/. /home/hauler
 COPY --from=builder --chown=hauler:hauler /hauler /usr/local/bin/hauler
 
-RUN apk --no-cache add curl
-
 USER hauler
 WORKDIR /home/hauler