diff --git a/.pipelines/pipeline.yaml b/.pipelines/pipeline.yaml
index 3cf3b8a9b5..1ad4c40b30 100644
--- a/.pipelines/pipeline.yaml
+++ b/.pipelines/pipeline.yaml
@@ -106,7 +106,7 @@ stages:
             displayName: "Run Tests"
 
           - script: |
-              sudo make hack-images VERSION=$(EnvironmentalVariables.Tag)
+              sudo make tools-images VERSION=$(EnvironmentalVariables.Tag)
               sudo make all-images VERSION=$(EnvironmentalVariables.Tag)
             workingDirectory: "$(modulePath)"
             name: "BuildImages"
diff --git a/Makefile b/Makefile
index ac1ca25a33..43178d7e38 100644
--- a/Makefile
+++ b/Makefile
@@ -80,7 +80,7 @@ CNI_NET_DIR = cni/network/plugin
 CNI_IPAM_DIR = cni/ipam/plugin
 CNI_IPAMV6_DIR = cni/ipam/pluginv6
 CNI_TELEMETRY_DIR = cni/telemetry/service
-ACNCLI_DIR = hack/acncli
+ACNCLI_DIR = tools/acncli
 TELEMETRY_CONF_DIR = telemetry
 CNS_DIR = cns/service
 CNMS_DIR = cnms/service
@@ -258,12 +258,12 @@ all-binaries-platforms:
 	export GOOS=windows; make all-binaries
 
 
-.PHONY: hack
-hack: acncli
+.PHONY: tools
+tools: acncli
 
-.PHONY: hack-images
-hack-images: 
-	docker build -f ./hack/acncli/Dockerfile --build-arg VERSION=$(VERSION) -t $(AZURE_CNI_IMAGE):$(VERSION) .
+.PHONY: tools-images
+tools-images: 
+	docker build -f ./tools/acncli/Dockerfile --build-arg VERSION=$(VERSION) -t $(AZURE_CNI_IMAGE):$(VERSION) .
 
 # Build the Azure CNM plugin image, installable with "docker plugin install".
 .PHONY: azure-vnet-plugin-image
diff --git a/cns/azure-cns.yaml b/cns/azure-cns.yaml
index 9f8e2cbcad..39877bc9b8 100644
--- a/cns/azure-cns.yaml
+++ b/cns/azure-cns.yaml
@@ -93,7 +93,7 @@ spec:
           effect: NoSchedule
       containers:
         - name: cns-container
-          image: mcr.microsoft.com/containernetworking/azure-cns:v1.2.0-alpha
+          image: mcr.microsoft.com/containernetworking/azure-cns:v1.2.3
           imagePullPolicy: IfNotPresent
           args: [ "-c", "tcp://$(CNSIpAddress):$(CNSPort)", "-t", "$(CNSLogTarget)"]
           volumeMounts:
diff --git a/hack/README.md b/hack/README.md
deleted file mode 100644
index 284907f286..0000000000
--- a/hack/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# NOTICE: 
-
-## **Tools in this directory are provided as is with no SLA, and not for production use.** They are purely experiments or hackathon projects that have no home.
-
-### Thanks,
-### Azure Container Networking Dev Team
\ No newline at end of file
diff --git a/tools/README.md b/tools/README.md
new file mode 100644
index 0000000000..46b96d8bad
--- /dev/null
+++ b/tools/README.md
@@ -0,0 +1,6 @@
+# NOTICE: 
+
+## **Tools in this directory are provided as is.**
+
+### Thanks,
+### Azure Container Networking Dev Team
\ No newline at end of file
diff --git a/hack/acncli/.dockerignore b/tools/acncli/.dockerignore
similarity index 100%
rename from hack/acncli/.dockerignore
rename to tools/acncli/.dockerignore
diff --git a/hack/acncli/Dockerfile b/tools/acncli/Dockerfile
similarity index 100%
rename from hack/acncli/Dockerfile
rename to tools/acncli/Dockerfile
diff --git a/hack/acncli/api/constants.go b/tools/acncli/api/constants.go
similarity index 100%
rename from hack/acncli/api/constants.go
rename to tools/acncli/api/constants.go
diff --git a/hack/acncli/cmd/install.go b/tools/acncli/cmd/install.go
similarity index 94%
rename from hack/acncli/cmd/install.go
rename to tools/acncli/cmd/install.go
index 13a1da1c18..cb6c7b667f 100644
--- a/hack/acncli/cmd/install.go
+++ b/tools/acncli/cmd/install.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	c "github.com/Azure/azure-container-networking/hack/acncli/api"
-	i "github.com/Azure/azure-container-networking/hack/acncli/installer"
+	c "github.com/Azure/azure-container-networking/tools/acncli/api"
+	i "github.com/Azure/azure-container-networking/tools/acncli/installer"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
diff --git a/hack/acncli/cmd/logs.go b/tools/acncli/cmd/logs.go
similarity index 95%
rename from hack/acncli/cmd/logs.go
rename to tools/acncli/cmd/logs.go
index 1db5eec0f0..8be432b970 100644
--- a/hack/acncli/cmd/logs.go
+++ b/tools/acncli/cmd/logs.go
@@ -3,7 +3,7 @@ package cmd
 import (
 	"fmt"
 
-	c "github.com/Azure/azure-container-networking/hack/acncli/api"
+	c "github.com/Azure/azure-container-networking/tools/acncli/api"
 	"github.com/nxadm/tail"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
diff --git a/hack/acncli/cmd/manager.go b/tools/acncli/cmd/manager.go
similarity index 100%
rename from hack/acncli/cmd/manager.go
rename to tools/acncli/cmd/manager.go
diff --git a/hack/acncli/cmd/root.go b/tools/acncli/cmd/root.go
similarity index 92%
rename from hack/acncli/cmd/root.go
rename to tools/acncli/cmd/root.go
index 7b1d6eb1da..273c3b5088 100644
--- a/hack/acncli/cmd/root.go
+++ b/tools/acncli/cmd/root.go
@@ -3,7 +3,7 @@ package cmd
 import (
 	"fmt"
 
-	c "github.com/Azure/azure-container-networking/hack/acncli/api"
+	c "github.com/Azure/azure-container-networking/tools/acncli/api"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
diff --git a/hack/acncli/deployment/manager.yaml b/tools/acncli/deployment/manager.yaml
similarity index 98%
rename from hack/acncli/deployment/manager.yaml
rename to tools/acncli/deployment/manager.yaml
index 979e64cb09..de614d3f04 100644
--- a/hack/acncli/deployment/manager.yaml
+++ b/tools/acncli/deployment/manager.yaml
@@ -19,7 +19,7 @@ spec:
       hostNetwork: true
       containers:
         - name: azure-cni-installer
-          image: mcr.microsoft.com/containernetworking/azure-cni-manager:v1.2.0-2-g0671b63 
+          image: mcr.microsoft.com/containernetworking/azure-cni-manager:v1.2.3
           imagePullPolicy: Always
           env:
             - name: AZURE_CNI_OS
diff --git a/hack/acncli/installer/conflist.go b/tools/acncli/installer/conflist.go
similarity index 97%
rename from hack/acncli/installer/conflist.go
rename to tools/acncli/installer/conflist.go
index c2baf7f75e..3ef15095de 100644
--- a/hack/acncli/installer/conflist.go
+++ b/tools/acncli/installer/conflist.go
@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 
 	ccn "github.com/Azure/azure-container-networking/cni"
-	c "github.com/Azure/azure-container-networking/hack/acncli/api"
+	c "github.com/Azure/azure-container-networking/tools/acncli/api"
 )
 
 type rawPlugin struct {
diff --git a/hack/acncli/installer/install.go b/tools/acncli/installer/install.go
similarity index 98%
rename from hack/acncli/installer/install.go
rename to tools/acncli/installer/install.go
index 1a4469d9ae..9de2554f3c 100644
--- a/hack/acncli/installer/install.go
+++ b/tools/acncli/installer/install.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"strings"
 
-	c "github.com/Azure/azure-container-networking/hack/acncli/api"
+	c "github.com/Azure/azure-container-networking/tools/acncli/api"
 )
 
 type InstallerConfig struct {
diff --git a/hack/acncli/installer/utils.go b/tools/acncli/installer/utils.go
similarity index 95%
rename from hack/acncli/installer/utils.go
rename to tools/acncli/installer/utils.go
index 15b43dd9f1..88b66db2ee 100644
--- a/hack/acncli/installer/utils.go
+++ b/tools/acncli/installer/utils.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"path/filepath"
 
-	c "github.com/Azure/azure-container-networking/hack/acncli/api"
+	c "github.com/Azure/azure-container-networking/tools/acncli/api"
 )
 
 func SetOrUseDefault(setValue, defaultValue string) string {
diff --git a/hack/acncli/main.go b/tools/acncli/main.go
similarity index 86%
rename from hack/acncli/main.go
rename to tools/acncli/main.go
index be9c625fcb..f09fbb0e31 100644
--- a/hack/acncli/main.go
+++ b/tools/acncli/main.go
@@ -1,12 +1,12 @@
 package main
 
 import (
-	"github.com/Azure/azure-container-networking/hack/acncli/cmd"
+	"github.com/Azure/azure-container-networking/tools/acncli/cmd"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
 
-	c "github.com/Azure/azure-container-networking/hack/acncli/api"
+	c "github.com/Azure/azure-container-networking/tools/acncli/api"
 )
 
 var (