diff --git a/Makefile b/Makefile
index b746adf..5a48d81 100644
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,27 @@ _LORAX_TEMPLATES += $(call get_templates,cache)
 _TEMPLATE_VARS   += DNF_CACHE
 endif
 
-include Makefile.flatpak
+ifneq ($(FLATPAK_DIR),)
+_FLATPAK_REPO_GPG := $(shell curl -L $(FLATPAK_REMOTE_URL) | grep -i '^GPGKey=' | cut -d= -f2)
+export _FLATPAK_REPO_URL := $(shell curl -L $(FLATPAK_REMOTE_URL) | grep -i '^URL=' | cut -d= -f2)
+_LORAX_ARGS      += -i flatpak-libs
+_LORAX_TEMPLATES += $(call get_templates,flatpak)
+_TEMPLATE_VARS   += FLATPAK_DIR FLATPAK_REMOTE_NAME FLATPAK_REMOTE_REFS FLATPAK_REMOTE_URL _FLATPAK_REPO_GPG _FLATPAK_REPO_URL
+else
+ifneq ($(FLATPAK_REMOTE_REFS_DIR),)
+COLLECTED_REFS := $(foreach file,$(filter-out README.md Makefile,$(wildcard $(FLATPAK_REMOTE_REFS_DIR)/*)),$(shell cat $(file)))
+export FLATPAK_REMOTE_REFS += $(sort $(COLLECTED_REFS))
+endif
+
+ifneq ($(FLATPAK_REMOTE_REFS),)
+_FLATPAK_REPO_GPG := $(shell curl -L $(FLATPAK_REMOTE_URL) | grep -i '^GPGKey=' | cut -d= -f2)
+export _FLATPAK_REPO_URL := $(shell curl -L $(FLATPAK_REMOTE_URL) | grep -i '^URL=' | cut -d= -f2)
+_LORAX_ARGS      += -i flatpak-libs
+_LORAX_TEMPLATES += $(call get_templates,flatpak) \
+					external/fedora-lorax-templates/ostree-based-installer/lorax-embed-flatpaks.tmpl
+_TEMPLATE_VARS   += FLATPAK_DIR FLATPAK_REMOTE_NAME FLATPAK_REMOTE_REFS FLATPAK_REMOTE_URL _FLATPAK_REPO_GPG _FLATPAK_REPO_URL
+endif
+endif
 
 
 ifneq ($(SECURE_BOOT_KEY_URL),)
diff --git a/Makefile.flatpak b/Makefile.flatpak
deleted file mode 100644
index 6279934..0000000
--- a/Makefile.flatpak
+++ /dev/null
@@ -1,21 +0,0 @@
-ifneq ($(FLATPAK_DIR),)
-_FLATPAK_REPO_GPG := $(shell curl -L $(FLATPAK_REMOTE_URL) | grep -i '^GPGKey=' | cut -d= -f2)
-export _FLATPAK_REPO_URL := $(shell curl -L $(FLATPAK_REMOTE_URL) | grep -i '^URL=' | cut -d= -f2)
-_LORAX_ARGS      += -i flatpak-libs
-_LORAX_TEMPLATES += $(call get_templates,flatpak)
-_TEMPLATE_VARS   += FLATPAK_DIR FLATPAK_REMOTE_NAME FLATPAK_REMOTE_REFS FLATPAK_REMOTE_URL _FLATPAK_REPO_GPG _FLATPAK_REPO_URL
-else
-ifneq ($(FLATPAK_REMOTE_REFS_DIR),)
-COLLECTED_REFS := $(foreach file,$(filter-out README.md Makefile,$(wildcard $(FLATPAK_REMOTE_REFS_DIR)/*)),$(shell cat $(file)))
-FLATPAK_REMOTE_REFS += $(sort $(COLLECTED_REFS))
-endif
-
-ifneq ($(FLATPAK_REMOTE_REFS),)
-_FLATPAK_REPO_GPG := $(shell curl -L $(FLATPAK_REMOTE_URL) | grep -i '^GPGKey=' | cut -d= -f2)
-export _FLATPAK_REPO_URL := $(shell curl -L $(FLATPAK_REMOTE_URL) | grep -i '^URL=' | cut -d= -f2)
-_LORAX_ARGS      += -i flatpak-libs
-_LORAX_TEMPLATES += $(call get_templates,flatpak) \
-					external/fedora-lorax-templates/ostree-based-installer/lorax-embed-flatpaks.tmpl
-_TEMPLATE_VARS   += FLATPAK_DIR FLATPAK_REMOTE_NAME FLATPAK_REMOTE_REFS FLATPAK_REMOTE_URL _FLATPAK_REPO_GPG _FLATPAK_REPO_URL
-endif
-endif
\ No newline at end of file
diff --git a/action.yml b/action.yml
index 83aa786..18bc12d 100644
--- a/action.yml
+++ b/action.yml
@@ -145,8 +145,8 @@ runs:
         cd ${{ github.action_path }}
         make flatpaks/repo \
           FLATPAK_REMOTE_NAME="${{ inputs.flatpak_remote_name }}" \
-          FLATPAK_REMOTE_REFS="${{ inputs.flatpak_remote_refs }}" \
-          FLATPAK_REMOTE_REFS_DIR="${{ inputs.flatpak_remote_refs_dir }}" \
+          ${{ inputs.flatpak_remote_refs && format('FLATPAK_REMOTE_REFS="{0}"', inputs.flatpak_remote_refs || ''}} \
+          ${{ inputs.flatpak_remote_refs_dir && format('FLATPAK_REMOTE_REFS_DIR="{0}"', inputs.flatpak_remote_refs_dir || ''}} \
           FLATPAK_REMOTE_URL="${{ inputs.flatpak_remote_url }}" \
           IMAGE_NAME="${{ inputs.image_name }}" \
           IMAGE_REPO="${{ inputs.image_repo }}" \