diff --git a/affine/deploy.sh b/affine/deploy.sh
index f1bde3b..83a8019 100755
--- a/affine/deploy.sh
+++ b/affine/deploy.sh
@@ -48,14 +48,14 @@ podman create \
 podman generate systemd \
   --new \
   --name $CONTAINER_REDIS \
-  --files --restart-policy always --container-prefix=affine > /dev/null
+  --files --restart-policy always --container-prefix=$CONTAINER_PREFIX > /dev/null
 mv $CONTAINER_PREFIX-$CONTAINER_REDIS.service ./systemd-units/
 
 
 podman create \
   --name $CONTAINER_POSTGRES \
   --network $NETWORK \
-  -p $DATABASE_PORT:$DATABASE_PORT \
+  -p $DATABASE_PORT:5432 \
   -e POSTGRES_USER=$DB_USERNAME \
   -e POSTGRES_PASSWORD=$DB_PASSWORD \
   -e POSTGRES_DB=$DB_DATABASE \
@@ -66,7 +66,7 @@ podman create \
 podman generate systemd \
   --new \
   --name $CONTAINER_POSTGRES \
-  --files --restart-policy always --container-prefix=affine > /dev/null
+  --files --restart-policy always --container-prefix=$CONTAINER_PREFIX > /dev/null
 mv $CONTAINER_PREFIX-$CONTAINER_POSTGRES.service ./systemd-units/
 
 mkdir -p $USER_SYSTEMD
@@ -115,7 +115,7 @@ podman create \
 podman generate systemd \
   --new \
   --name $CONTAINER_SERVER \
-  --files --restart-policy always --container-prefix=affine > /dev/null
+  --files --restart-policy always --container-prefix=$CONTAINER_PREFIX > /dev/null
 mv $CONTAINER_PREFIX-$CONTAINER_SERVER.service ./systemd-units/
 sed -i "/^\[Unit\]/a After=$CONTAINER_PREFIX-$CONTAINER_POSTGRES.service $CONTAINER_PREFIX-$CONTAINER_REDIS.service\nRequires=$CONTAINER_PREFIX-$CONTAINER_POSTGRES.service $CONTAINER_PREFIX-$CONTAINER_REDIS.service" ./systemd-units/$CONTAINER_PREFIX-$CONTAINER_SERVER.service