diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 475734f..3c9a4e0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -19,7 +19,7 @@ jobs:
         id: builder
         working-directory: ${{ env.working-directory }} 
         run: |
-          bash build-docker.sh
+          PRESERVE_CONTAINER=1 bash build-docker.sh
           echo ::set-output name=filename::$(ls deploy/*.tar.xz | xargs -n 1 basename)
       - name: Fix Permissions
         id: fix_perm_filename
@@ -45,4 +45,8 @@ jobs:
           upload_url: ${{ steps.create_release.outputs.upload_url }} 
           asset_path: ${{ env.working-directory }}/deploy/${{ steps.builder.outputs.filename }}
           asset_name: ${{ steps.builder.outputs.filename }}
-          asset_content_type: application/zip
\ No newline at end of file
+          asset_content_type: application/x-tar
+      - name: Delete Image
+        id: delete_image
+        run: |
+          rm ${{ env.working-directory }}/deploy/${{ steps.builder.outputs.filename }}
\ No newline at end of file
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index a1122ef..099dc91 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -16,7 +16,7 @@ jobs:
         id: builder
         working-directory: ${{ env.working-directory }} 
         run: |
-          bash build-docker.sh
+          PRESERVE_CONTAINER=1 bash build-docker.sh
           echo ::set-output name=filename::$(ls deploy/*.tar.xz | xargs -n 1 basename)
       - name: Fix Permissions
         id: fix_perm_filename
@@ -26,4 +26,8 @@ jobs:
       - uses: actions/upload-artifact@v1
         with:
           name: ${{ steps.builder.outputs.filename }}
-          path: ${{ env.working-directory }}/deploy/${{ steps.builder.outputs.filename }}
\ No newline at end of file
+          path: ${{ env.working-directory }}/deploy/${{ steps.builder.outputs.filename }}
+      - name: Delete Image
+        id: delete_image
+        run: |
+          rm ${{ env.working-directory }}/deploy/${{ steps.builder.outputs.filename }}
\ No newline at end of file
diff --git a/builder/stage4/07-pisdr-limesdr/00-run.sh b/builder/stage4/07-pisdr-limesdr/00-run.sh
index 3380d45..0cd9c79 100755
--- a/builder/stage4/07-pisdr-limesdr/00-run.sh
+++ b/builder/stage4/07-pisdr-limesdr/00-run.sh
@@ -12,7 +12,7 @@ cd LimeSuite
 git pull
 mkdir -p build
 cd build
-cmake -DCMAKE_CXX_LINK_FLAGS="$(DCMAKE_CXX_LINK_FLAGS) -latomic" ../
+cmake -DCMAKE_CXX_FLAGS=-latomic ../
 make -j$(nproc) install
 ldconfig
 
diff --git a/builder/stage4/07-pisdr-limesdr/01-run.sh b/builder/stage4/07-pisdr-limesdr/01-run.sh
index 7c9e6d7..de55a24 100755
--- a/builder/stage4/07-pisdr-limesdr/01-run.sh
+++ b/builder/stage4/07-pisdr-limesdr/01-run.sh
@@ -12,7 +12,7 @@ cd gr-limesdr
 git pull
 mkdir -p build
 cd build
-cmake ../
+cmake -DCMAKE_CXX_FLAGS=-latomic ../
 make -j$(nproc) install
 ldconfig
 EOF