diff --git a/ecs-init/ECSVERSION b/ecs-init/ECSVERSION
index 39fc130e..f107550c 100644
--- a/ecs-init/ECSVERSION
+++ b/ecs-init/ECSVERSION
@@ -1 +1 @@
-1.36.0
+1.36.1
diff --git a/ecs-init/config/common.go b/ecs-init/config/common.go
index 0ab5e7b6..278af480 100644
--- a/ecs-init/config/common.go
+++ b/ecs-init/config/common.go
@@ -42,7 +42,7 @@ const (
 	// DefaultAgentVersion is the version of the agent that will be
 	// fetched if required. This should look like v1.2.3 or an
 	// 8-character sha, as is downloadable from S3.
-	DefaultAgentVersion = "v1.36.0"
+	DefaultAgentVersion = "v1.36.1"
 
 	// AgentPartitionBucketName is the name of the paritional s3 bucket that stores the agent
 	AgentPartitionBucketName = "amazon-ecs-agent"
diff --git a/packaging/amazon-linux-ami/ecs-init.spec b/packaging/amazon-linux-ami/ecs-init.spec
index 367a9f3d..3fd95f7b 100644
--- a/packaging/amazon-linux-ami/ecs-init.spec
+++ b/packaging/amazon-linux-ami/ecs-init.spec
@@ -32,7 +32,7 @@
 %endif
 
 Name:           ecs-init
-Version:        1.36.0
+Version:        1.36.1
 Release:        1%{?dist}
 License:        Apache 2.0
 Summary:        Amazon Elastic Container Service initialization application
@@ -255,6 +255,8 @@ fi
 %endif
 
 %changelog
+* Wed Jan 15 2020 Yunhee Lee <yhlee@amazon.com> - 1.36.1-1
+- Cache Agent version 1.36.1
 
 * Wed Jan 08 2020 Cameron Sparr <cssparr@amazon.com> - 1.36.0-1
 - Cache Agent version 1.36.0
diff --git a/packaging/suse/amazon-ecs.service b/packaging/suse/amazon-ecs.service
index 05b49d67..35a6fbe4 100644
--- a/packaging/suse/amazon-ecs.service
+++ b/packaging/suse/amazon-ecs.service
@@ -10,7 +10,8 @@ Requires=network.target
 Type=simple
 ExecStartPre=/usr/sbin/amazon-ecs-init pre-start
 ExecStart=/usr/sbin/amazon-ecs-init start
-ExecStop=/usr/sbin/amazon-ecs-init pre-stop
+ExecStop=/usr/sbin/amazon-ecs-init stop
+ExecStopPost=/usr/sbin/amazon-ecs-init post-stop
 ExecReload=/usr/sbin/amazon-ecs-init reload-cache
 
 [Install]
diff --git a/packaging/ubuntu-trusty/debian/changelog b/packaging/ubuntu-trusty/debian/changelog
index 813d6910..c9265c7f 100644
--- a/packaging/ubuntu-trusty/debian/changelog
+++ b/packaging/ubuntu-trusty/debian/changelog
@@ -1,3 +1,8 @@
+amazon-ecs-init (1.36.1-1) trusty; urgency=medium
+
+  * Cache Agent version 1.36.1
+
+  -- Yunhee Lee <yhlee@amazon.com> Wed, 08 Jan 2020 11:00:00 -0800
 amazon-ecs-init (1.36.0-1) trusty; urgency=medium
 
   * Cache Agent version 1.36.0