diff --git a/tribes/packages/otp.scm b/tribes/packages/otp.scm
index f744152..6a5c9f5 100644
--- a/tribes/packages/otp.scm
+++ b/tribes/packages/otp.scm
@@ -48,14 +48,15 @@
     (version "1.19.5")
     (source
      (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/elixir-lang/elixir")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (string-append
+             "https://github.com/elixir-lang/elixir/archive/refs/tags/v"
+             version
+             ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "1i10a5d7mlcrav47k7qirqvrqn2kbl5265fbcp8fzavr86xz67m6"))
+         "0dlflwcdx0da09grndgsj2c9k1ix7vq6vaxg4lgaq42bsy5hnx8h"))
        (patches (search-patches "elixir-path-length.patch"))))
     (inputs
      `(("bash-minimal" ,bash-minimal)
diff --git a/tribes/services/tribes.scm b/tribes/services/tribes.scm
index 55f3d37..b5fb67e 100644
--- a/tribes/services/tribes.scm
+++ b/tribes/services/tribes.scm
@@ -247,6 +247,10 @@
       (stop #~(make-kill-destructor))
       (respawn? #f)))))
 
+(define (tribes-root-shepherd-services config)
+  (append (tribes-migrations-shepherd-service config)
+          (tribes-shepherd-service config)))
+
 (define (tribes-profile-packages config)
   (match (tribes-configuration-package config)
     (#f '())
@@ -261,9 +265,7 @@
           (service-extension activation-service-type
                              tribes-activation)
           (service-extension shepherd-root-service-type
-                             tribes-migrations-shepherd-service)
-          (service-extension shepherd-root-service-type
-                             tribes-shepherd-service)
+                             tribes-root-shepherd-services)
           (service-extension profile-service-type
                              tribes-profile-packages)))
    (default-value (tribes-configuration))