diff --git a/polygon-base.yml b/polygon-base.yml
index 1efdbdc8..ef3a9563 100644
--- a/polygon-base.yml
+++ b/polygon-base.yml
@@ -12,8 +12,8 @@ services:
   heimdalld:                  
     build: &ref_0          
       args:                                                                                           
-        UPSTREAM_VERSION: v0.2.7                                                                      
-      context: ./polygon/heimdall         
+        UPSTREAM_VERSION: v0.2.8
+        context: ./polygon/heimdall
       dockerfile: Dockerfile                                                                          
     volumes:                             
       - "heimdall_data:/root/.heimdalld"                                                              
diff --git a/polygon/heimdall/Dockerfile b/polygon/heimdall/Dockerfile
index 41faf7e3..647f3a64 100644
--- a/polygon/heimdall/Dockerfile
+++ b/polygon/heimdall/Dockerfile
@@ -1,5 +1,5 @@
 # Build and Install Heimdall in a stock Go builder container
-FROM golang:1.16-alpine
+FROM golang:1.17-alpine
 
 # Install packages we need
 RUN apk add --no-cache make gcc musl-dev linux-headers git
diff --git a/polygon/heimdall/scripts/entrypoint.sh b/polygon/heimdall/scripts/entrypoint.sh
index 56370e8b..f8eca05d 100755
--- a/polygon/heimdall/scripts/entrypoint.sh
+++ b/polygon/heimdall/scripts/entrypoint.sh
@@ -1,6 +1,6 @@
-#!/bin/sh                                                                                                                                                                                           [1/1829]
-                                                   
-# exit script on any error                         
+#!/bin/sh
+
+# exit script on any error
 set -e
 
 # Set Heimdall Home Directory