diff --git a/.github/workflows/pi-gen.yml b/.github/workflows/pi-gen.yml
index 9661034..50bb660 100644
--- a/.github/workflows/pi-gen.yml
+++ b/.github/workflows/pi-gen.yml
@@ -22,7 +22,7 @@ jobs:
           path: pi-gen/
 
       - name: Set env
-        run: cat pi-gen/config >> $GITHUB_ENV
+        run: egrep -vi '(^#|^export|^$)' pi-gen/config >> $GITHUB_ENV
      
       - name: Echo env variables
         run: env
diff --git a/pi-gen/config b/pi-gen/config
index 6877461..119ec6f 100644
--- a/pi-gen/config
+++ b/pi-gen/config
@@ -36,4 +36,5 @@ APT_PROXY="http://172.17.2.88:3142"
 DUMP1090_RECEIVER_SERIAL="stx:1090:0"
 DUMP978_RECEIVER_SERIAL="stx:978:0" 
 COMITUP_WEB_PORT="9080"
-export SHARED_FILES="${STAGE_DIR}/../../shared_files"
+SHARED_FILES="${STAGE_DIR}/../../shared_files"
+export SHARED_FILES="${SHARED_FILES}"