diff --git a/_service b/_service
index d289e5c..750cad5 100644
--- a/_service
+++ b/_service
@@ -3,8 +3,8 @@
     <param name="url">https://github.com/rancher/system-agent</param>
     <param name="scm">git</param>
     <param name="exclude">.git</param>
-    <param name="versionformat">v0.3.5</param>
-    <param name="revision">v0.3.5</param>
+    <param name="versionformat">v0.3.6</param>
+    <param name="revision">v0.3.6</param>
     <param name="filename">elemental-system-agent</param>
     <param name="versionrewrite-pattern">v(.*)</param>
     <param name="changesgenerate">enable</param>
diff --git a/_servicedata b/_servicedata
index cdcb9aa..2296b2c 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/rancher/system-agent</param>
-              <param name="changesrevision">806ef425e08933933f92bf574c2a5201107f3b24</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">41c07d0600cf95ad31ea8c160e1867bb470b9071</param></service></servicedata>
\ No newline at end of file
diff --git a/elemental-system-agent-0.3.5.tar.gz b/elemental-system-agent-0.3.5.tar.gz
deleted file mode 100644
index 5a7d7fd..0000000
--- a/elemental-system-agent-0.3.5.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c3ee8659f48ba3e633522f5c1f5a687c9414fe883486e065082de4ae8bb56aaf
-size 84932
diff --git a/elemental-system-agent-0.3.6.tar.gz b/elemental-system-agent-0.3.6.tar.gz
new file mode 100644
index 0000000..b0b9924
--- /dev/null
+++ b/elemental-system-agent-0.3.6.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:87eb4c80a0133a7110a642c94232ef13a19b1922b079c1336ca05cd78042c8a4
+size 69169
diff --git a/elemental-system-agent.changes b/elemental-system-agent.changes
index a72279d..4fbd71c 100644
--- a/elemental-system-agent.changes
+++ b/elemental-system-agent.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Apr 12 07:03:33 UTC 2024 - fredrik.lonnegren@suse.com
+
+- Update to version 0.3.6:
+  * Update Go to 1.21 and deps for k8s 1.27 (#152)
+  * Apply suggestions from code review
+  * Cleanup and exit if cannot download valid connection info.
+
 -------------------------------------------------------------------
 Thu Mar 14 10:39:13 UTC 2024 - kkaempf@suse.com
 
diff --git a/elemental-system-agent.spec b/elemental-system-agent.spec
index d2c5a4c..e4a7f50 100644
--- a/elemental-system-agent.spec
+++ b/elemental-system-agent.spec
@@ -18,7 +18,7 @@
 
 Name:           elemental-system-agent
 %define gitname system-agent
-Version:        0.3.5
+Version:        0.3.6
 Release:        0
 Summary:        Rancher system agent to apply 'plans' to a system
 License:        Apache-2.0
diff --git a/vendor.tar.gz b/vendor.tar.gz
index f86c883..4392d9c 100644
--- a/vendor.tar.gz
+++ b/vendor.tar.gz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:002466bdf025c4095c56174972bd3ee9697e15ec7ba97f650f4b59a540e63566
-size 6180194
+oid sha256:76271c7a9fc379538b802bfd39259cb21f6d8b416cf2b40628079390352f0021
+size 9824558