diff --git a/templates/Makefile b/templates/Makefile
deleted file mode 100644
index 25c454a98c..0000000000
--- a/templates/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-SDK_VERSION ?= v0.0.0
-CRATES_IO_VERSION := $(shell echo "${SDK_VERSION}" | tr -d 'v')
-
-bump-versions: bump-go-versions bump-rust-versions
-
-bump-go-versions:
-	@for dir in $$(ls -d *-go) ; do \
-		cd $$dir/content ; \
-		sed -r -i.sed-bak -e 's%require github.com/fermyon/spin/sdk/go/v2 [-a-zA-Z0-9.]+%require github.com/fermyon/spin/sdk/go/v2 ${SDK_VERSION}%g' go.mod ; \
-		sed -i.sed-bak -e 's/{{project-name | snake_case}}/foo/g' go.mod ; \
-		go mod tidy ; \
-		sed -i.sed-bak -e 's/foo/{{project-name | snake_case}}/g' go.mod ; \
-		rm *.sed-bak ; \
-		cd - 2>&1 >/dev/null ; \
-	done
-
-bump-rust-versions:
-	for dir in $$(ls -d *-rust) ; do \
-		cd $$dir/content ; \
-		sed -r -i.sed-bak -e 's%(spin-sdk = )(("[0-9]+.[0-9]+.[0-9]+(-rc.[0-9]+)?")|(\{ git = "https://github.com/spinframework/spin", branch = "main" \}))%spin-sdk = "${CRATES_IO_VERSION}"%g' Cargo.toml.tmpl ; \
-		rm *.sed-bak ; \
-		cd - 2>&1 >/dev/null ; \
-	done
diff --git a/templates/http-go/content/go.mod b/templates/http-go/content/go.mod
index b395dc51e4..8a08e762ef 100644
--- a/templates/http-go/content/go.mod
+++ b/templates/http-go/content/go.mod
@@ -2,6 +2,6 @@ module github.com/{{project-name | snake_case}}
 
 go 1.22
 
-require github.com/fermyon/spin/sdk/go/v2 v2.2.0
+require github.com/spinframework/spin-go-sdk v2.2.1
 
 require github.com/julienschmidt/httprouter v1.3.0 // indirect
diff --git a/templates/http-go/content/go.sum b/templates/http-go/content/go.sum
index c283accd85..447c042d52 100644
--- a/templates/http-go/content/go.sum
+++ b/templates/http-go/content/go.sum
@@ -1,4 +1,4 @@
-github.com/fermyon/spin/sdk/go/v2 v2.2.0 h1:zHZdIqjbUwyxiwdygHItnM+vUUNSZ3CX43jbIUemBI4=
-github.com/fermyon/spin/sdk/go/v2 v2.2.0/go.mod h1:kfJ+gdf/xIaKrsC6JHCUDYMv2Bzib1ohFIYUzvP+SCw=
 github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
 github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
+github.com/spinframework/spin-go-sdk/v2 v2.2.1 h1:ceAbRU+D3xmyZ8ScDLeFoT763ikFIUEmSjgsrD11v8k=
+github.com/spinframework/spin-go-sdk/v2 v2.2.1/go.mod h1:vocVZB4qlTG8C5yoliKIAJCuv4x7sqK0GmVkWeD9N/A=
diff --git a/templates/http-go/content/main.go b/templates/http-go/content/main.go
index fc8a531815..ec62db7c30 100644
--- a/templates/http-go/content/main.go
+++ b/templates/http-go/content/main.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/http"
 
-	spinhttp "github.com/fermyon/spin/sdk/go/v2/http"
+	spinhttp "github.com/spinframework/spin-go-sdk/v2/http"
 )
 
 func init() {
diff --git a/templates/redis-go/content/go.mod b/templates/redis-go/content/go.mod
index 014c36d49b..9ea1b7b9eb 100644
--- a/templates/redis-go/content/go.mod
+++ b/templates/redis-go/content/go.mod
@@ -2,4 +2,4 @@ module github.com/{{project-name | snake_case}}
 
 go 1.22
 
-require github.com/fermyon/spin/sdk/go/v2 v2.2.0
+require github.com/spinframework/spin-go-sdk v2.2.1
diff --git a/templates/redis-go/content/go.sum b/templates/redis-go/content/go.sum
index 69abe73b9c..d853fe4454 100644
--- a/templates/redis-go/content/go.sum
+++ b/templates/redis-go/content/go.sum
@@ -1,2 +1,2 @@
-github.com/fermyon/spin/sdk/go/v2 v2.2.0 h1:zHZdIqjbUwyxiwdygHItnM+vUUNSZ3CX43jbIUemBI4=
-github.com/fermyon/spin/sdk/go/v2 v2.2.0/go.mod h1:kfJ+gdf/xIaKrsC6JHCUDYMv2Bzib1ohFIYUzvP+SCw=
+github.com/spinframework/spin-go-sdk/v2 v2.2.1 h1:ceAbRU+D3xmyZ8ScDLeFoT763ikFIUEmSjgsrD11v8k=
+github.com/spinframework/spin-go-sdk/v2 v2.2.1/go.mod h1:vocVZB4qlTG8C5yoliKIAJCuv4x7sqK0GmVkWeD9N/A=
diff --git a/templates/redis-go/content/main.go b/templates/redis-go/content/main.go
index cf7ce8137d..50ed538a14 100644
--- a/templates/redis-go/content/main.go
+++ b/templates/redis-go/content/main.go
@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/fermyon/spin/sdk/go/v2/redis"
+	"github.com/spinframework/spin-go-sdk/v2/redis"
 )
 
 func init() {