diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7d2c473..1d63bb0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,7 +36,7 @@ build:
   script:
     # N/B: There could be more than one merge-request open with this branch's HEAD
     - |
-        IMAGE_TAG="${CI_COMMIT_BRANCH}";
+        IMAGE_TAG="${CI_COMMIT_REF_SLUG}";
         if [[ -n "$CI_COMMIT_TAG" ]]; then
             IMAGE_TAG="${CI_COMMIT_TAG}";
         elif [[ -n "$CI_OPEN_MERGE_REQUESTS" ]]; then
diff --git a/etc/systemd/system.conf.d/kmsglog.conf b/etc/systemd/system.conf.d/10-kmsglog.conf
similarity index 100%
rename from etc/systemd/system.conf.d/kmsglog.conf
rename to etc/systemd/system.conf.d/10-kmsglog.conf
diff --git a/etc/systemd/system.conf.d/20-tasklimit.conf b/etc/systemd/system.conf.d/20-tasklimit.conf
new file mode 100644
index 0000000..591341a
--- /dev/null
+++ b/etc/systemd/system.conf.d/20-tasklimit.conf
@@ -0,0 +1,2 @@
+[Manager]
+DefaultTasksMax=infinity
diff --git a/etc/systemd/system/user-.slice.d/20-tasklimit.conf b/etc/systemd/system/user-.slice.d/20-tasklimit.conf
new file mode 100644
index 0000000..7bb86d5
--- /dev/null
+++ b/etc/systemd/system/user-.slice.d/20-tasklimit.conf
@@ -0,0 +1,2 @@
+[Slice]
+TasksMax=infinity