diff --git a/.gitlab-ci/vagrant.yml b/.gitlab-ci/vagrant.yml
index b6cf2df1a63db708e21d43f90f5070da88c88076..a847923c1be5c0727292185694bf43d3f2ddd289 100644
--- a/.gitlab-ci/vagrant.yml
+++ b/.gitlab-ci/vagrant.yml
@@ -16,6 +16,12 @@ molecule_tests:
     - ./tests/scripts/vagrant_clean.sh
   script:
     - ./tests/scripts/molecule_run.sh
+  after_script:
+    - chronic ./tests/scripts/molecule_logs.sh
+  artifacts:
+    when: always
+    paths:
+      - molecule_logs/
 
 .vagrant:
   extends: .testcases
diff --git a/roles/bootstrap-os/tasks/bootstrap-centos.yml b/roles/bootstrap-os/tasks/bootstrap-centos.yml
index 3e8aae8a2b4ef96bd899e00c7f1233622dde5182..23ca011b76340c6382066238485285f6ed5f290b 100644
--- a/roles/bootstrap-os/tasks/bootstrap-centos.yml
+++ b/roles/bootstrap-os/tasks/bootstrap-centos.yml
@@ -79,7 +79,7 @@
     - { option: "name", value: "CentOS-{{ ansible_distribution_major_version }} - Extras" }
     - { option: "enabled", value: "1" }
     - { option: "gpgcheck", value: "0" }
-    - { option: "baseurl", value: "http://mirror.centos.org/centos/{{ ansible_distribution_major_version }}/extras/$basearch/os/" }
+    - { option: "baseurl", value: "http://mirror.centos.org/centos/{{ ansible_distribution_major_version }}/extras/$basearch/{% if ansible_distribution_major_version|int > 7 %}os/{% endif %}" }
   when:
     - use_oracle_public_repo|default(true)
     - '''ID="ol"'' in os_release.stdout_lines'
diff --git a/tests/scripts/molecule_logs.sh b/tests/scripts/molecule_logs.sh
new file mode 100755
index 0000000000000000000000000000000000000000..4908d81d55eaaede6446863eb90c6418a6f4c19a
--- /dev/null
+++ b/tests/scripts/molecule_logs.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# Ensure a clean environent
+rm -fr molecule_logs
+mkdir -p molecule_logs
+
+# Collect and archive the logs
+find ~/.cache/molecule/ -name \*.out -o -name \*.err -type f | xargs tar -uf molecule_logs/molecule.tar
+gzip molecule_logs/molecule.tar
diff --git a/tests/scripts/molecule_run.sh b/tests/scripts/molecule_run.sh
index deb06426840c38bd36ae7f0b21ea2fe2436c482a..ff2966fd0276fd7df73fda3e64b7628a9bc1940a 100755
--- a/tests/scripts/molecule_run.sh
+++ b/tests/scripts/molecule_run.sh
@@ -6,7 +6,7 @@ export LANG=C.UTF-8
 
 for d in $(find roles -name molecule -type d)
 do
-    cd $(dirname $d)
+    pushd $(dirname $d)
     molecule test --all
-    cd -
-done
\ No newline at end of file
+    popd
+done