diff --git a/rekahsoft-gnu/packages/terraform.scm b/rekahsoft-gnu/packages/terraform.scm
index 63bde8e..f02d843 100644
--- a/rekahsoft-gnu/packages/terraform.scm
+++ b/rekahsoft-gnu/packages/terraform.scm
@@ -33,7 +33,7 @@
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/hashicorp/terraform.git")
+                    (url "https://github.com/hashicorp/terraform")
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -110,7 +110,7 @@ instead of @command{terraform-0.12}.")))
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/hashicorp/terraform.git")
+                    (url "https://github.com/hashicorp/terraform")
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -169,7 +169,7 @@ popular service providers as well as custom in-house solutions.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/terraform-providers/terraform-provider-aws.git")
+                    (url "https://github.com/terraform-providers/terraform-provider-aws")
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -193,7 +193,7 @@ popular service providers as well as custom in-house solutions.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/terraform-providers/terraform-provider-google.git")
+                    (url "https://github.com/terraform-providers/terraform-provider-google")
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -217,7 +217,7 @@ popular service providers as well as custom in-house solutions.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/terraform-providers/terraform-provider-kubernetes.git")
+                    (url "https://github.com/terraform-providers/terraform-provider-kubernetes")
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -241,7 +241,7 @@ popular service providers as well as custom in-house solutions.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/terraform-providers/terraform-provider-azurerm.git")
+                    (url "https://github.com/terraform-providers/terraform-provider-azurerm")
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -265,7 +265,7 @@ popular service providers as well as custom in-house solutions.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/terraform-providers/terraform-provider-alicloud.git")
+                    (url "https://github.com/terraform-providers/terraform-provider-alicloud")
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -289,7 +289,7 @@ popular service providers as well as custom in-house solutions.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/terraform-providers/terraform-provider-vsphere.git")
+                    (url "https://github.com/terraform-providers/terraform-provider-vsphere")
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -313,7 +313,7 @@ popular service providers as well as custom in-house solutions.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/terraform-providers/terraform-provider-cloudflare.git")
+                    (url "https://github.com/terraform-providers/terraform-provider-cloudflare")
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -337,7 +337,7 @@ popular service providers as well as custom in-house solutions.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/terraform-providers/terraform-provider-vault.git")
+                    (url "https://github.com/terraform-providers/terraform-provider-vault")
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -361,7 +361,7 @@ popular service providers as well as custom in-house solutions.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/terraform-providers/terraform-provider-gitlab.git")
+                    (url "https://github.com/terraform-providers/terraform-provider-gitlab")
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -385,7 +385,7 @@ popular service providers as well as custom in-house solutions.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/terraform-providers/terraform-provider-github.git")
+                    (url "https://github.com/terraform-providers/terraform-provider-github")
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -409,7 +409,7 @@ popular service providers as well as custom in-house solutions.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/terraform-providers/terraform-provider-digitalocean.git")
+                    (url "https://github.com/terraform-providers/terraform-provider-digitalocean")
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -433,7 +433,7 @@ popular service providers as well as custom in-house solutions.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/terraform-providers/terraform-provider-helm.git")
+                    (url "https://github.com/terraform-providers/terraform-provider-helm")
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -457,7 +457,7 @@ popular service providers as well as custom in-house solutions.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/terraform-providers/terraform-provider-linode.git")
+                    (url "https://github.com/terraform-providers/terraform-provider-linode")
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -481,7 +481,7 @@ popular service providers as well as custom in-house solutions.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/terraform-providers/terraform-provider-random.git")
+                    (url "https://github.com/terraform-providers/terraform-provider-random")
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -505,7 +505,7 @@ popular service providers as well as custom in-house solutions.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/terraform-providers/terraform-provider-null.git")
+                    (url "https://github.com/terraform-providers/terraform-provider-null")
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -529,7 +529,7 @@ popular service providers as well as custom in-house solutions.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/terraform-providers/terraform-provider-heroku.git")
+                    (url "https://github.com/terraform-providers/terraform-provider-heroku")
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -553,7 +553,7 @@ popular service providers as well as custom in-house solutions.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/terraform-providers/terraform-provider-nomad.git")
+                    (url "https://github.com/terraform-providers/terraform-provider-nomad")
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -577,7 +577,7 @@ popular service providers as well as custom in-house solutions.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/terraform-providers/terraform-provider-postgresql.git")
+                    (url "https://github.com/terraform-providers/terraform-provider-postgresql")
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -601,7 +601,7 @@ popular service providers as well as custom in-house solutions.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/terraform-providers/terraform-provider-grafana.git")
+                    (url "https://github.com/terraform-providers/terraform-provider-grafana")
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -625,7 +625,7 @@ popular service providers as well as custom in-house solutions.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/terraform-providers/terraform-provider-docker.git")
+                    (url "https://github.com/terraform-providers/terraform-provider-docker")
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -649,7 +649,7 @@ popular service providers as well as custom in-house solutions.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/terraform-providers/terraform-provider-openstack.git")
+                    (url "https://github.com/terraform-providers/terraform-provider-openstack")
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256