diff --git a/kubernetes-manifests/emailservice.yaml b/kubernetes-manifests/emailservice.yaml
index c5dd7d8..179db0e 100644
--- a/kubernetes-manifests/emailservice.yaml
+++ b/kubernetes-manifests/emailservice.yaml
@@ -39,6 +39,9 @@ spec:
           periodSeconds: 5
           exec:
             command: ["/bin/grpc_health_probe", "-addr=:8080"]
+        env:
+        - name: ENABLE_PROFILER
+          value: "0"
         resources:
           requests:
             cpu: 100m
diff --git a/kubernetes-manifests/recommendationservice.yaml b/kubernetes-manifests/recommendationservice.yaml
index 07d4c27..eeb7782 100644
--- a/kubernetes-manifests/recommendationservice.yaml
+++ b/kubernetes-manifests/recommendationservice.yaml
@@ -42,6 +42,8 @@ spec:
         env:
         - name: PRODUCT_CATALOG_SERVICE_ADDR
           value: "productcatalogservice:3550"
+        - name: ENABLE_PROFILER
+          value: "0"
         resources:
           requests:
             cpu: 100m
diff --git a/src/emailservice/Dockerfile b/src/emailservice/Dockerfile
index 65a58a3..4c7f225 100644
--- a/src/emailservice/Dockerfile
+++ b/src/emailservice/Dockerfile
@@ -28,19 +28,6 @@ WORKDIR /email_server
 # Grab packages from builder
 COPY --from=builder /usr/local/lib/python3.7/ /usr/local/lib/python3.7/
 
-# Enable/disable Stackdriver Profiler agent
-ENV ENABLE_PROFILER 1
-
-# If code is not running in GCP, follow the documentation at
-# https://cloud.google.com/profiler/docs/profiling-external
-# and set the following environment variables. Credential key of the service
-# account should have the following roles:
-# Stackdriver Profiler Agent
-# Cloud Trace Agent
-
-#ENV GOOGLE_APPLICATION_CREDENTIALS "key.json"
-#ENV GCP_PROJECT_ID "Your GCP project ID"
-
 # Add the application
 COPY . .
 
diff --git a/src/recommendationservice/Dockerfile b/src/recommendationservice/Dockerfile
index 7f6f6ce..fc70bec 100644
--- a/src/recommendationservice/Dockerfile
+++ b/src/recommendationservice/Dockerfile
@@ -15,19 +15,6 @@ WORKDIR /recommendationservice
 COPY requirements.txt requirements.txt
 RUN pip install -r requirements.txt
 
-# Enable/disable Stackdriver Profiler agent
-ENV ENABLE_PROFILER 0
-
-# If code is not running in GCP, follow the documentation at
-# https://cloud.google.com/profiler/docs/profiling-external
-# and set the following environment variables. Credential key of the service
-# account should have the following roles:
-# Stackdriver Profiler Agent
-# Cloud Trace Agent
-
-#ENV GOOGLE_APPLICATION_CREDENTIALS "key.json"
-#ENV GCP_PROJECT_ID "Your GCP project ID"
-
 # add files into working directory
 COPY . .
 
diff --git a/src/recommendationservice/key.json b/src/recommendationservice/key.json
deleted file mode 100644
index 98005c6..0000000
--- a/src/recommendationservice/key.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "type": "service_account",
-  "project_id": "kchadalavada-misc",
-  "private_key_id": "b88d9758992b7b61fba5e40d2f7829a5df40baf9",
-  "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDoIvAOhNZt7ZRj\nLM8/vdXBU55bvPv04JKtfT70GjBiRCjWjuBeotfEFWwW5OM3uTgtwvfABb90p/lt\n3hbvBS2Fo3h2jTkriHa4ED6pysqg/X3wGAhIc6O53MqUOrnNSy0S6Mwm4L+eMSEx\nw0PSv7qDqPfI0fTDEasaKpjhRjL8rB2a56YC25Gx1sj10OdFpYkZF4+qctLCyMqb\n5yTMuSyA7T+9+eCtwfUKz3RyJMxwH+MCqjVKJG7xXM9hJyUWRCjReyjiPXxcHCbs\nAOzfsdLUpdmeN+c+Hi31KEhjrY1MKXPEqZOpmkCy0cy/JiWv+EQlkLtDquNJafrX\nDvrwX7ZTAgMBAAECggEAXyICU1DpN7/HsiUpAixgL4x/N4VplF98fRD4/bzF21+n\nhNak6OO/nSJSW8eNvsZvWYGvWsiAP+Se+gGsUGRE1aG6uosBxO92B9TQeXEcPYHl\nXMHckyShEoiDlN/ESXfnjvpMwBoXLVNhES2+292rKE3Uzj4NGuxgvKZ8ZMYKGzX+\nOQtPKUfVy712uB/aF8yk3uVhlGJBuCVoDDiCThoAWAwxrDZFa4D4b7Kd7haYSoAw\n+RZzxB25ViFxektOheDZ4RRkRpUZf3IuBIGYToSTZUb9kgqRjSfIpbJ8g7x4l2dM\nYu2z0j+735AWA0RA3U5P+dF7MGn501ms5It0PQVAIQKBgQD78rqJhOVo6uIx73w7\nqyAxmVv0XF+Q+NtZHgRuVKC1/wY9ksGkptpm3M6I7lZsFxccKsAkzX8JVMKCbAbh\nRanGm5TUOuljM9qQN8tMc6AM99wOj/XU6afc/ijSTcV8eNnwGfBFuU+eSgFB6kl1\ncFB0ZvlfahknTsVPz+KtE/CjewKBgQDr3qTw1OZAE5Pb2M1lSF7T5A9nb6qKrsVQ\nOt+BUKac9R2ILe1bj0dxp53tn8k05GuCmpzLA93KiKe5kC3F3zYh6TSvyR1PT4eO\nSl/JaDDxLO0lusdnVeESewTaqTe6UVavIP3A2inTUDRSwPA+/43CSNypvkJ3li9Q\nBKJksby1CQKBgQDC76xaiKPDiLDYuBYkSKRRG/pk2C/tCE8W5b3B6+Kozhfy/iCr\nl5m2KrP2iIn/eeIcngsqroDTJGyW4qR0GiVhELGXf7liUxWRrkmy7mdwgToXXlVz\nlhGWUGQfS6M4Sn09Y6RfHiE3NMVCTdbmca8eUSozI/EwU6cguJUHGz1+DwKBgBcB\nSCUVHr/xKOKwapgOTvFrtPTpt0B/e08v7sy2CQoV/iNiF1xuxREYwBaFFyLJhJLg\ncZp7bg5q9bDrlwtNkgIMtM7QVsN9hkMijeUe/GcJcrfTV8+EWMdsqDSLfJv3gvTh\nyt4caSfrEq9fkg8S7cidQqhrnh/7zfGIAi7ABx/BAoGBALlliOD25QyWATB/gb/r\nNNinDeIb389NLkY1sgL7DqP5z5rIX2hj52HxaoIb5pLkH9MC051rRZWd1BlIRW2i\nIympGlanI8Dst7wwyO93m/fSavECfS4tEABeqvVB06AsLN61WDD/4A+xfwl61D42\nVTarsbI3OVEUUUTeeNN53jeO\n-----END PRIVATE KEY-----\n",
-  "client_email": "profsvcaccnt@kchadalavada-misc.iam.gserviceaccount.com",
-  "client_id": "104915287304547845415",
-  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
-  "token_uri": "https://oauth2.googleapis.com/token",
-  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
-  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/profsvcaccnt%40kchadalavada-misc.iam.gserviceaccount.com"
-}
diff --git a/src/recommendationservice/recommendation_server.py b/src/recommendationservice/recommendation_server.py
index 7d2dc2f..f76db10 100644
--- a/src/recommendationservice/recommendation_server.py
+++ b/src/recommendationservice/recommendation_server.py
@@ -52,9 +52,9 @@ def initStackdriverProfiling():
   for retry in xrange(1,4):
     try:
       if project_id:
-        googlecloudprofiler.start(service='recommendation_server-out', service_version='1.0.0', verbose=0, project_id=project_id)
+        googlecloudprofiler.start(service='recommendation_server', service_version='1.0.0', verbose=0, project_id=project_id)
       else:
-        googlecloudprofiler.start(service='recommendation_server-out', service_version='1.0.0', verbose=0)
+        googlecloudprofiler.start(service='recommendation_server', service_version='1.0.0', verbose=0)
       logger.info("Successfully started Stackdriver Profiler.")
       return
     except (BaseException) as exc: