diff --git a/Makefile b/Makefile
index 1d56a4417..bc0f1f92d 100644
--- a/Makefile
+++ b/Makefile
@@ -281,7 +281,7 @@ semconv-generate: $(SEMCONVKIT)
 	docker run --rm \
 		-u $(DOCKER_USER) \
 		--env HOME=/tmp/weaver \
-		--mount 'type=bind,source=$(PWD)/semconv,target=/home/weaver/templates/registry/go,readonly' \
+		--mount 'type=bind,source=$(PWD)/semconv/templates,target=/home/weaver/templates,readonly' \
 		--mount 'type=bind,source=$(PWD)/semconv/${TAG},target=/home/weaver/target' \
 		--mount 'type=bind,source=$(HOME)/.weaver,target=/tmp/weaver/.weaver' \
 		$(WEAVER_IMAGE) registry generate \
diff --git a/semconv/attribute_group.go.j2 b/semconv/templates/registry/go/attribute_group.go.j2
similarity index 100%
rename from semconv/attribute_group.go.j2
rename to semconv/templates/registry/go/attribute_group.go.j2
diff --git a/semconv/helpers.j2 b/semconv/templates/registry/go/helpers.j2
similarity index 100%
rename from semconv/helpers.j2
rename to semconv/templates/registry/go/helpers.j2
diff --git a/semconv/instrument.j2 b/semconv/templates/registry/go/instrument.j2
similarity index 100%
rename from semconv/instrument.j2
rename to semconv/templates/registry/go/instrument.j2
diff --git a/semconv/metric.go.j2 b/semconv/templates/registry/go/metric.go.j2
similarity index 100%
rename from semconv/metric.go.j2
rename to semconv/templates/registry/go/metric.go.j2