diff --git a/Dockerfile b/Dockerfile
index c514163b..95ebf08f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,8 +25,7 @@ RUN dnf -y install dnf-plugins-core \
 RUN mkdir -p $BIN_DIR \
   && mkdir -p $APP_DIR \
   && mkdir -p $DATA_DIR \
-  && mkdir -p $DATA_DIR/logs \
-  && mkdir -p /tmp/containers
+  && mkdir -p $DATA_DIR/logs
 
 COPY entrypoint.sh pyproject.toml uv.lock README.md $APP_DIR/
 COPY webhook_server_container $APP_DIR/webhook_server_container/
diff --git a/entrypoint.sh b/entrypoint.sh
index f3cc4c41..1701cdc1 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-rm -rf /run/containers/storage /run/libpod
-
 SERVER_RUN_CMD="uv run uvicorn webhook_server_container.app:FASTAPI_APP --host 0.0.0.0 --port 5000 "
 UVICORN_WORKERS="${UVICORN_MAX_WORKERS:=10}"
 
diff --git a/webhook_server_container/libs/github_api.py b/webhook_server_container/libs/github_api.py
index e6a66dd3..d6cb6057 100644
--- a/webhook_server_container/libs/github_api.py
+++ b/webhook_server_container/libs/github_api.py
@@ -818,11 +818,11 @@ def delete_remote_tag_for_merged_or_closed_pr(self) -> None:
             return
 
         pr_tag = repository_full_tag.split(":")[-1]
+        registry_info = self.container_repository.split("/")
+        registry_url = "" if len(registry_info) < 3 else registry_info[0]
         base_regctl_command = (
             "podman run --rm --net host  -v regctl-conf:/home/appuser/.regctl/ ghcr.io/regclient/regctl:latest"
         )
-        registry_info = self.container_repository.split("/")
-        registry_url = "" if len(registry_info) < 3 else registry_info[0]
 
         rc, out, err = run_command(
             command=f"{base_regctl_command} registry login {registry_url} -u {self.container_repository_username} "
@@ -1874,7 +1874,7 @@ def process_retest_command(self, issue_comment_id: int, command_args: str) -> No
             return
 
         if "all" in command_args:
-            if len(command_args) > 1:
+            if len(_target_tests) > 1:
                 msg = "Invalid command. `all` cannot be used with other tests"
                 error_msg = f"{self.log_prefix} {msg}."
                 self.logger.debug(error_msg)