diff --git a/debian-docker-compose.yml b/docker-compose.yml
similarity index 58%
rename from debian-docker-compose.yml
rename to docker-compose.yml
index b126b0b..e25f68c 100644
--- a/debian-docker-compose.yml
+++ b/docker-compose.yml
@@ -3,9 +3,9 @@ services:
 #########################
    podman-builder:
       hostname: podman-builder
-      image: debian
+      image: debian:11
       working_dir: /root/
       volumes:
           - ./build:/root/build
-          - ./podmandeb-build.sh:/root/podmandeb-build.sh
-      command: bash /root/podmandeb-build.sh
+          - ./podman-build.sh:/root/podman-build.sh
+      command: bash /root/podman-build.sh
diff --git a/podmanbin-build.sh b/podmanbin-build.sh
deleted file mode 100644
index 3733d66..0000000
--- a/podmanbin-build.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-cd /root/
-
-apt update
-apt upgrade -y
-apt-get install -y \
-  btrfs-progs \
-  crun \
-  git \
-  golang-go \
-  go-md2man \
-  iptables \
-  libassuan-dev \
-  libbtrfs-dev \
-  libc6-dev \
-  libdevmapper-dev \
-  libglib2.0-dev \
-  libgpgme-dev \
-  libgpg-error-dev \
-  libprotobuf-dev \
-  libprotobuf-c-dev \
-  libseccomp-dev \
-  libselinux1-dev \
-  libsystemd-dev \
-  pkg-config \
-  uidmap
-go get golang.org/dl/go1.17.6
-go1.17.6 download
-
-apt install -y jq wget curl make
-
-VERSION=$(curl -s https://api.github.com/repos/containers/podman/releases/latest | jq '.name' -r)
-export VERSION
-
-git clone https://github.com/containers/podman.git podman-$VERSION
-cd podman-$VERSION
-git checkout tags/$VERSION
-
-make ENABLE_BUILDTAGS="systemd" binaries
-
-cp -vr bin/ ../build
diff --git a/podmandeb-build.sh b/podmanbuild.sh
similarity index 68%
rename from podmandeb-build.sh
rename to podmanbuild.sh
index 88584f0..5605ae4 100644
--- a/podmandeb-build.sh
+++ b/podmanbuild.sh
@@ -2,6 +2,48 @@
 
 cd /root/
 
+apt update
+apt upgrade -y
+apt-get install -y \
+  btrfs-progs \
+  crun \
+  git \
+  golang-go \
+  go-md2man \
+  iptables \
+  libassuan-dev \
+  libbtrfs-dev \
+  libc6-dev \
+  libdevmapper-dev \
+  libglib2.0-dev \
+  libgpgme-dev \
+  libgpg-error-dev \
+  libprotobuf-dev \
+  libprotobuf-c-dev \
+  libseccomp-dev \
+  libselinux1-dev \
+  libsystemd-dev \
+  pkg-config \
+  uidmap
+go get golang.org/dl/go1.17.6
+go1.17.6 download
+
+apt install -y jq wget curl make
+
+VERSION=$(curl -s https://api.github.com/repos/containers/podman/releases/latest | jq '.name' -r)
+export VERSION
+
+git clone https://github.com/containers/podman.git podman-$VERSION
+cd podman-$VERSION
+git checkout tags/$VERSION
+
+make ENABLE_BUILDTAGS="systemd" binaries
+
+cp -vr bin/ ../build
+#!/bin/bash
+
+cd /root/
+
 apt update
 apt upgrade -y
 apt install -y jq wget curl make
diff --git a/ubuntu-docker-compose.yml b/ubuntu-docker-compose.yml
deleted file mode 100644
index 8926b34..0000000
--- a/ubuntu-docker-compose.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-version: '3.5'
-services:
-#########################
-   podman-builder:
-      hostname: podman-builder
-      image: ubuntu:focal
-      working_dir: /root/
-      volumes:
-          - ./build:/root/build
-          - ./podmanbin-build.sh:/root/podmanbin-build.sh
-      command: bash /root/podmanbin-build.sh