diff --git a/Makefile b/Makefile
index f97e2fd4f5..091981fda5 100644
--- a/Makefile
+++ b/Makefile
@@ -31,8 +31,8 @@ OS_RELEASE  ?= ubuntu
 OS_VERSION  ?= 22.04
 BASE_IMAGE  = "docker.io/$(OS_RELEASE):$(OS_VERSION)"
 IMAGE_TAG   = "agent_$(OS_RELEASE)_$(OS_VERSION)"
-DOCKERFILE_PATH = "./scripts/docker/nginx-oss/$(CONTAINER_OS_TYPE)/Dockerfile"
-OFFICIAL_IMAGE_DOCKERFILE_PATH = "./test/docker/oss/$(CONTAINER_OS_TYPE)/Dockerfile"
+DOCKERFILE_PATH = "./test/docker/nginx-oss/$(CONTAINER_OS_TYPE)/Dockerfile"
+OFFICIAL_IMAGE_DOCKERFILE_PATH = "./test/docker/nginx-official-image/$(CONTAINER_OS_TYPE)/Dockerfile"
 IMAGE_PATH ?= "/nginx/agent"
 TAG ?= ""
 
@@ -190,23 +190,23 @@ run-mock-management-grpc-server: ## Run mock management plane gRPC server
 .PHONY: build-test-plus-image
 build-test-plus-image:
 	$(CONTAINER_BUILDENV) $(CONTAINER_CLITOOL) build -t nginx_plus_$(IMAGE_TAG) . \
-		--no-cache -f ./scripts/docker/nginx-plus/deb/Dockerfile \
+		--no-cache -f ./test/docker/nginx-plus/deb/Dockerfile \
 		--secret id=nginx-crt,src=$(CERTS_DIR)/nginx-repo.crt \
 		--secret id=nginx-key,src=$(CERTS_DIR)/nginx-repo.key \
 		--build-arg PACKAGE_NAME=$(PACKAGE_NAME) \
 		--build-arg PACKAGES_REPO=$(OSS_PACKAGES_REPO) \
 		--build-arg BASE_IMAGE=$(BASE_IMAGE) \
-		--build-arg ENTRY_POINT=./scripts/docker/entrypoint.sh
+		--build-arg ENTRY_POINT=./test/docker/entrypoint.sh
 
 .PHONY: build-test-oss-image
 build-test-oss-image:
 	$(CONTAINER_BUILDENV) $(CONTAINER_CLITOOL) build -t nginx_oss_$(IMAGE_TAG) . \
-		--no-cache -f ./scripts/docker/nginx-oss/deb/Dockerfile \
+		--no-cache -f ./test/docker/nginx-oss/deb/Dockerfile \
 		--target install-agent-local \
 		--build-arg PACKAGE_NAME=$(PACKAGE_NAME) \
 		--build-arg PACKAGES_REPO=$(OSS_PACKAGES_REPO) \
 		--build-arg BASE_IMAGE=$(BASE_IMAGE) \
-		--build-arg ENTRY_POINT=./scripts/docker/entrypoint.sh
+		--build-arg ENTRY_POINT=./test/docker/entrypoint.sh
 
 .PHONY: run-mock-management-otel-collector
 run-mock-management-otel-collector: ## Run mock management plane OTel collector
diff --git a/internal/collector/nginxossreceiver/internal/metadata/generated_status.go b/internal/collector/nginxossreceiver/internal/metadata/generated_status.go
index 3eb166a1ad..f4cd74a5e4 100644
--- a/internal/collector/nginxossreceiver/internal/metadata/generated_status.go
+++ b/internal/collector/nginxossreceiver/internal/metadata/generated_status.go
@@ -7,8 +7,7 @@ import (
 )
 
 var (
-	Type      = component.MustNewType("nginx")
-	ScopeName = "otelcol/nginxreceiver"
+	Type = component.MustNewType("nginx")
 )
 
 const (
diff --git a/internal/collector/nginxplusreceiver/internal/metadata/generated_status.go b/internal/collector/nginxplusreceiver/internal/metadata/generated_status.go
index 96f453b98a..feb047ea22 100644
--- a/internal/collector/nginxplusreceiver/internal/metadata/generated_status.go
+++ b/internal/collector/nginxplusreceiver/internal/metadata/generated_status.go
@@ -7,8 +7,7 @@ import (
 )
 
 var (
-	Type      = component.MustNewType("nginxplus")
-	ScopeName = "otelcol/nginxplusreceiver"
+	Type = component.MustNewType("nginxplus")
 )
 
 const (
diff --git a/scripts/docker/entrypoint.sh b/test/docker/entrypoint.sh
similarity index 100%
rename from scripts/docker/entrypoint.sh
rename to test/docker/entrypoint.sh
diff --git a/test/docker/oss/apk/Dockerfile b/test/docker/nginx-official-image/apk/Dockerfile
similarity index 100%
rename from test/docker/oss/apk/Dockerfile
rename to test/docker/nginx-official-image/apk/Dockerfile
diff --git a/test/docker/oss/deb/Dockerfile b/test/docker/nginx-official-image/deb/Dockerfile
similarity index 100%
rename from test/docker/oss/deb/Dockerfile
rename to test/docker/nginx-official-image/deb/Dockerfile
diff --git a/scripts/docker/nginx-oss/apk/Dockerfile b/test/docker/nginx-oss/apk/Dockerfile
similarity index 100%
rename from scripts/docker/nginx-oss/apk/Dockerfile
rename to test/docker/nginx-oss/apk/Dockerfile
diff --git a/scripts/docker/nginx-oss/deb/Dockerfile b/test/docker/nginx-oss/deb/Dockerfile
similarity index 100%
rename from scripts/docker/nginx-oss/deb/Dockerfile
rename to test/docker/nginx-oss/deb/Dockerfile
diff --git a/scripts/docker/nginx-oss/rpm/Dockerfile b/test/docker/nginx-oss/rpm/Dockerfile
similarity index 100%
rename from scripts/docker/nginx-oss/rpm/Dockerfile
rename to test/docker/nginx-oss/rpm/Dockerfile
diff --git a/scripts/docker/nginx-plus/deb/Dockerfile b/test/docker/nginx-plus/deb/Dockerfile
similarity index 100%
rename from scripts/docker/nginx-plus/deb/Dockerfile
rename to test/docker/nginx-plus/deb/Dockerfile
diff --git a/test/helpers/test_containers_utils.go b/test/helpers/test_containers_utils.go
index b86b7e7607..485c0d954f 100644
--- a/test/helpers/test_containers_utils.go
+++ b/test/helpers/test_containers_utils.go
@@ -56,7 +56,7 @@ func StartContainer(
 				"BASE_IMAGE":                     ToPtr(baseImage),
 				"OS_RELEASE":                     ToPtr(osRelease),
 				"OS_VERSION":                     ToPtr(osVersion),
-				"ENTRY_POINT":                    ToPtr("./scripts/docker/entrypoint.sh"),
+				"ENTRY_POINT":                    ToPtr("./test/docker/entrypoint.sh"),
 				"CONTAINER_NGINX_IMAGE_REGISTRY": ToPtr(containerRegistry),
 				"IMAGE_PATH":                     ToPtr(imagePath),
 				"TAG":                            ToPtr(tag),