diff --git a/lfs/Config b/lfs/Config
index f597b8c65..d17600820 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -115,6 +115,9 @@ ifeq "$(BUILD_ARCH)" "aarch64"
 	GRUB_ARCH = arm64
 endif
 
+# Go
+export GOPATH = $(HOME)/gopath
+
 ###############################################################################
 # Common Macro Definitions
 ###############################################################################
@@ -156,6 +159,7 @@ define POSTBUILD
 	@echo "Updating linker cache..."
 	@type -p ldconfig >/dev/null && ldconfig || :
 	@echo "Install done; saving file list to $(TARGET) ..."
+	@rm -rf $(GOPATH)
 	@$(FIND_FILES) > $(DIR_SRC)/lsalrnew
 	@diff $(DIR_SRC)/lsalr $(DIR_SRC)/lsalrnew | grep '^> ' | sed 's/^> //' > $(TARGET)_diff
 	@cp -f $(DIR_SRC)/lsalrnew $(DIR_SRC)/lsalr
diff --git a/lfs/amazon-ssm-agent b/lfs/amazon-ssm-agent
index da164ced8..b477690a4 100644
--- a/lfs/amazon-ssm-agent
+++ b/lfs/amazon-ssm-agent
@@ -37,8 +37,6 @@ PAK_VER    = 1
 
 DEPS       = ""
 
-export GOPATH = $(HOME)/gopath
-
 DIR_BUILD  = $(GOPATH)/src/github.com/aws/amazon-ssm-agent
 
 ###############################################################################