diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7f040c9..6a89493 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,10 +11,9 @@ variables:
   # Optional:
   # PROJECT_NAME: example-project
 
-
 before_script:
   - 'cd ./tools/truss && make install'
-  - 'cd ./cmd/schema && make install'
+  - 'cd ./tools/schema && make install'
 
 stages:
   - build:dev
diff --git a/tools/devops/.gitignore b/tools/devops/.gitignore
new file mode 100644
index 0000000..e18b651
--- /dev/null
+++ b/tools/devops/.gitignore
@@ -0,0 +1 @@
+devops
diff --git a/tools/devops/cmd/deploy/service_deploy.go b/tools/devops/cmd/deploy/service_deploy.go
index a91e564..2d3b599 100644
--- a/tools/devops/cmd/deploy/service_deploy.go
+++ b/tools/devops/cmd/deploy/service_deploy.go
@@ -1,4 +1,4 @@
-package devops
+package deploy
 
 import (
 	"compress/gzip"
@@ -19,7 +19,7 @@ import (
 	"time"
 
 	"geeks-accelerator/oss/saas-starter-kit/internal/platform/tests"
-	"geeks-accelerator/oss/saas-starter-kit/tools/truss/internal/retry"
+	"geeks-accelerator/oss/saas-starter-kit/tools/devops/internal/retry"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/service/acm"
@@ -1026,6 +1026,7 @@ func ServiceDeploy(log *log.Logger, req *serviceDeployRequest) error {
 
 		return nil
 	}
+	_ = ec2TagResource
 
 	// Try to find the AWS Cloudwatch Log Group by name or create new one.
 	{
diff --git a/tools/devops/makefile b/tools/devops/makefile
new file mode 100644
index 0000000..12f59fb
--- /dev/null
+++ b/tools/devops/makefile
@@ -0,0 +1,8 @@
+SHELL := /bin/bash
+
+install:
+	go install .
+
+build:
+	go install .
+
diff --git a/cmd/schema/.gitignore b/tools/schema/.gitignore
similarity index 100%
rename from cmd/schema/.gitignore
rename to tools/schema/.gitignore
diff --git a/cmd/schema/README.md b/tools/schema/README.md
similarity index 100%
rename from cmd/schema/README.md
rename to tools/schema/README.md
diff --git a/cmd/schema/main.go b/tools/schema/main.go
similarity index 100%
rename from cmd/schema/main.go
rename to tools/schema/main.go
diff --git a/cmd/schema/makefile b/tools/schema/makefile
similarity index 100%
rename from cmd/schema/makefile
rename to tools/schema/makefile
diff --git a/cmd/schema/sample.env b/tools/schema/sample.env
similarity index 100%
rename from cmd/schema/sample.env
rename to tools/schema/sample.env