diff --git a/Makefile b/Makefile
index f70af13..a46a2e6 100644
--- a/Makefile
+++ b/Makefile
@@ -63,19 +63,20 @@
 	@echo "Usage: make [<target>]"
 	@echo "where available targets are:"
 	@echo ""
-	@echo "clean             : Removes any local filesystem artifacts generated by a build"
-	@echo "distclean         : Removes any local filesystem artifacts generated by a build or test run"
-	@echo "build             : Build all openolt adapter artifacts"
-	@echo "docker-build      : Build openolt adapter docker image"
-	@echo "docker-push       : Push the docker images to an external repository"
-	@echo "help              : Print this help"
-	@echo "lint              : Run all lint targets"
-	@echo "lint-dockerfile   : Perform static analysis on Dockerfiles"
-	@echo "lint-mod          : Verify the Go dependencies"
-	@echo "local-protos      : Copies a local verison of the VOLTHA protos into the vendor directory"
-	@echo "local-lib-go      : Copies a local version of the VOTLHA dependencies into the vendor directory"
-	@echo "sca               : Runs various SCA through golangci-lint tool"
-	@echo "test              : Run unit tests, if any"
+	@echo "clean             	: Removes any local filesystem artifacts generated by a build"
+	@echo "distclean         	: Removes any local filesystem artifacts generated by a build or test run"
+	@echo "build            	: Build all openolt adapter artifacts"
+	@echo "docker-build      	: Build openolt adapter docker image"
+	@echo "docker-build-profile	: Build openolt adapter docker image with profiling enabled"
+	@echo "docker-push       	: Push the docker images to an external repository"
+	@echo "help              	: Print this help"
+	@echo "lint              	: Run all lint targets"
+	@echo "lint-dockerfile   	: Perform static analysis on Dockerfiles"
+	@echo "lint-mod          	: Verify the Go dependencies"
+	@echo "local-protos      	: Copies a local verison of the VOLTHA protos into the vendor directory"
+	@echo "local-lib-go      	: Copies a local version of the VOTLHA dependencies into the vendor directory"
+	@echo "sca               	: Runs various SCA through golangci-lint tool"
+	@echo "test              	: Run unit tests, if any"
 	@echo
 
 ## Local Development Helpers
@@ -102,6 +103,9 @@
 docker-build: local-protos local-lib-go
 	docker build $(DOCKER_BUILD_ARGS) -t ${ADAPTER_IMAGENAME} -f docker/Dockerfile.openolt .
 
+docker-build-profile: local-protos local-lib-go
+	docker build $(DOCKER_BUILD_ARGS) -t ${ADAPTER_IMAGENAME}-profile -f docker/Dockerfile.openolt_profile .
+
 docker-push:
 	docker push ${ADAPTER_IMAGENAME}
 
diff --git a/VERSION b/VERSION
index f470771..80bfff5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.3.11
+2.3.12-dev
diff --git a/cmd/openolt-adapter/main.go b/cmd/openolt-adapter/main.go
index 69747df..2f7b235 100644
--- a/cmd/openolt-adapter/main.go
+++ b/cmd/openolt-adapter/main.go
@@ -477,6 +477,8 @@
 
 	log.SetAllLogLevel(logLevel)
 
+	realMain()
+
 	defer log.CleanUp()
 
 	// Print version / build information and exit
diff --git a/cmd/openolt-adapter/profile.go b/cmd/openolt-adapter/profile.go
new file mode 100644
index 0000000..5fa2bde
--- /dev/null
+++ b/cmd/openolt-adapter/profile.go
@@ -0,0 +1,37 @@
+// +build profile
+
+/*
+ * Copyright 2018-present Open Networking Foundation
+
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+
+ * http://www.apache.org/licenses/LICENSE-2.0
+
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package main
+
+import (
+	"fmt"
+	"github.com/opencord/voltha-lib-go/v3/pkg/log"
+	"net/http"
+	_ "net/http/pprof"
+)
+
+func realMain() {
+	go func() {
+		log.Info("TEO starting PProf server")
+		http.HandleFunc("/teo", func(w http.ResponseWriter, r *http.Request) {
+			fmt.Fprintf(w, "Hello, teo")
+		})
+		log.Fatal(http.ListenAndServe("0.0.0.0:6060", nil))
+	}()
+
+}
diff --git a/cmd/openolt-adapter/release.go b/cmd/openolt-adapter/release.go
new file mode 100644
index 0000000..d986dc8
--- /dev/null
+++ b/cmd/openolt-adapter/release.go
@@ -0,0 +1,28 @@
+// +build !profile
+
+/*
+ * Copyright 2018-present Open Networking Foundation
+
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+
+ * http://www.apache.org/licenses/LICENSE-2.0
+
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+//Package main invokes the application
+package main
+
+import (
+	"github.com/opencord/voltha-lib-go/v3/pkg/log"
+)
+
+func realMain() {
+	log.Infoln("NOT PROFILING")
+}
diff --git a/docker/Dockerfile.openolt b/docker/Dockerfile.openolt
index bde3d17..ded4efa 100644
--- a/docker/Dockerfile.openolt
+++ b/docker/Dockerfile.openolt
@@ -21,7 +21,7 @@
 RUN apk add --no-cache build-base=0.5-r1
 
 # Prepare directory structure
-WORKDIR /go/src
+WORKDIR /go/src/github.com/opencord/voltha-openolt-adapter
 COPY . .
 
 ARG org_label_schema_version=unknown
@@ -42,7 +42,7 @@
 	 -X github.com/opencord/voltha-lib-go/v3/pkg/version.os=$(go env GOHOSTOS) \
 	 -X github.com/opencord/voltha-lib-go/v3/pkg/version.arch=$(go env GOHOSTARCH) \
 	 -X github.com/opencord/voltha-lib-go/v3/pkg/version.buildTime=$org_label_schema_build_date" \
-	 cmd/openolt-adapter/main.go
+	 ./cmd/openolt-adapter/
 
 # -------------
 # Image creation stage
diff --git a/docker/Dockerfile.openolt_profile b/docker/Dockerfile.openolt_profile
new file mode 100644
index 0000000..e86b1ba
--- /dev/null
+++ b/docker/Dockerfile.openolt_profile
@@ -0,0 +1,73 @@
+# Copyright 2016 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# -------------
+# Build stage
+
+FROM golang:1.13.8-alpine3.11 AS build-env
+
+# Install required packages
+RUN apk add --no-cache build-base=0.5-r1
+
+# Prepare directory structure
+WORKDIR /go/src/github.com/opencord/voltha-openolt-adapter
+COPY . .
+
+ARG org_label_schema_version=unknown
+ARG org_label_schema_vcs_url=unknown
+ARG org_label_schema_vcs_ref=unknown
+ARG org_label_schema_build_date=unknown
+ARG org_opencord_vcs_commit_date=unknown
+ARG org_opencord_vcs_dirty=unknown
+
+# Build openolt
+SHELL ["/bin/ash", "-o", "pipefail", "-c"]
+RUN go build -tags profile -mod=vendor -o /go/bin/openolt \
+	-ldflags \
+	"-X github.com/opencord/voltha-openolt-adapter/config/version.version=$org_label_schema_version \
+	 -X github.com/opencord/voltha-openolt-adapter/config/version.vcsRef=$org_label_schema_vcs_ref  \
+	 -X github.com/opencord/voltha-openolt-adapter/config/version.vcsDirty=$org_opencord_vcs_dirty \
+	 -X github.com/opencord/voltha-openolt-adapter/config/version.goVersion=$(go version 2>&1 | sed -E  's/.*go([0-9]+\.[0-9]+\.[0-9]+).*/\1/g') \
+	 -X github.com/opencord/voltha-openolt-adapter/config/version.os=$(go env GOHOSTOS) \
+	 -X github.com/opencord/voltha-openolt-adapter/config/version.arch=$(go env GOHOSTARCH) \
+	 -X github.com/opencord/voltha-openolt-adapter/config/version.buildTime=$org_label_schema_build_date" \
+	 ./cmd/openolt-adapter/
+
+# -------------
+# Image creation stage
+
+FROM alpine:3.11.3
+
+# Set the working directory
+WORKDIR /app
+
+# Copy required files
+COPY --from=build-env /go/bin/openolt /app/
+
+# Label image
+ARG org_label_schema_version=unknown
+ARG org_label_schema_vcs_url=unknown
+ARG org_label_schema_vcs_ref=unknown
+ARG org_label_schema_build_date=unknown
+ARG org_opencord_vcs_commit_date=unknown
+ARG org_opencord_vcs_dirty=unknown
+
+LABEL org.label-schema.schema-version=1.0 \
+      org.label-schema.name=voltha-openolt-adapter-go \
+      org.label-schema.version=$org_label_schema_version \
+      org.label-schema.vcs-url=$org_label_schema_vcs_url \
+      org.label-schema.vcs-ref=$org_label_schema_vcs_ref \
+      org.label-schema.build-date=$org_label_schema_build_date \
+      org.opencord.vcs-commit-date=$org_opencord_vcs_commit_date \
+      org.opencord.vcs-dirty=$org_opencord_vcs_dirty