diff --git a/tests/roles/set_image/files/toolbox.conf b/tests/roles/set_image/files/toolbox.conf
index 4598d20..ff7f86b 100644
--- a/tests/roles/set_image/files/toolbox.conf
+++ b/tests/roles/set_image/files/toolbox.conf
@@ -14,4 +14,4 @@
 # If the name does not contain a registry, the local image storage will be
 # consulted, and if it's not present there then it will be pulled from a
 # suitable remote registry.
-image = "registry.stage.redhat.io/ubi8:latest"
+image = "registry.access.redhat.com/ubi8:latest"
diff --git a/tests/roles/set_image/tasks/main.yml b/tests/roles/set_image/tasks/main.yml
index 97702b8..2112a92 100644
--- a/tests/roles/set_image/tasks/main.yml
+++ b/tests/roles/set_image/tasks/main.yml
@@ -1,4 +1,8 @@
 ---
-# Copy the toolbox.conf file
+# Copy the toolbox.conf file to /etc/containers/
+- name: Check containers directory exists
+  file:
+    path: /etc/containers
+    state: directory
 - name: Copy toolbox.conf file to set default image
   copy: src={{ role_path }}/files/toolbox.conf dest=/etc/containers/toolbox.conf force=yes mode=0666
diff --git a/toolbox.spec b/toolbox.spec
index 8b74b24..ee7bcde 100644
--- a/toolbox.spec
+++ b/toolbox.spec
@@ -9,7 +9,7 @@ Version:       0.0.99.3
 %global goipath github.com/containers/%{name}
 %gometa
 
-Release:       0.10.git660b6970e998%{?dist}
+Release:       0.11.git660b6970e998%{?dist}
 Summary:       Unprivileged development environment
 
 License:       ASL 2.0
@@ -115,6 +115,10 @@ install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf
 
 
 %changelog
+* Thu Sep 16 2021 Oliver Gutiérrez <ogutierrez@redhat.com> - 0.0.99.3-0.11.git660b6970e998
+- Changed image for tests and added /etc/containers dir check
+  Related: #2000051
+
 * Tue Sep 14 2021 Oliver Gutiérrez <ogutierrez@redhat.com> - 0.0.99.3-0.10.git660b6970e998
 - Added ability to force test system id and version id
   Related: #2000051