diff --git a/.buildkite/filebeat/scripts/packaging/package.sh b/.buildkite/filebeat/scripts/packaging/package.sh
index 44e91044576..f338e97c0b4 100755
--- a/.buildkite/filebeat/scripts/packaging/package.sh
+++ b/.buildkite/filebeat/scripts/packaging/package.sh
@@ -15,35 +15,35 @@ TARGET="observability-ci/${BEAT_NAME}"
 echo "--- Creating package"
 mage -d filebeat package
 
-echo "--- Distribution list"
-dir="filebeat/build/distributions"
-buildkite-agent artifact upload "$dir/*.tar.gz;$dir/*.tar.gz.sha512"
-
-echo "--- Docker image list"
-docker images
-
-define_tags
-check_is_arm
-
-echo "--- Tag & Push"
-for variant in "${VARIANTS[@]}"; do
-  source="beats/${BEAT_NAME}${variant}"
-
-  for tag in "${tags[@]}"; do
-  targetTag=$tag${is_arm}
-
-  sourceName="${DOCKER_REGISTRY}/${source}:${SOURCE_TAG}"
-  targetName="${DOCKER_REGISTRY}/${TARGET}:${targetTag}"
-  # Remove following lines once beats fully migrated
-  targetName="${targetName}-buildkite"
-
-  if docker image inspect "${sourceName}" &>/dev/null; then
-    echo "Source name: $sourceName Target name: $targetName"
-    docker tag "$sourceName" "$targetName"
-#    docker push "$targetName"
-
-  else
-    echo "Docker image ${sourceName} does not exist"
-  fi
-done
-done
+#echo "--- Distribution list"
+#dir="filebeat/build/distributions"
+#buildkite-agent artifact upload "$dir/*.tar.gz;$dir/*.tar.gz.sha512"
+#
+#echo "--- Docker image list"
+#docker images
+#
+#define_tags
+#check_is_arm
+#
+#echo "--- Tag & Push"
+#for variant in "${VARIANTS[@]}"; do
+#  source="beats/${BEAT_NAME}${variant}"
+#
+#  for tag in "${tags[@]}"; do
+#  targetTag=$tag${is_arm}
+#
+#  sourceName="${DOCKER_REGISTRY}/${source}:${SOURCE_TAG}"
+#  targetName="${DOCKER_REGISTRY}/${TARGET}:${targetTag}"
+#  # Remove following lines once beats fully migrated
+#  targetName="${targetName}-buildkite"
+#
+#  if docker image inspect "${sourceName}" &>/dev/null; then
+#    echo "Source name: $sourceName Target name: $targetName"
+#    docker tag "$sourceName" "$targetName"
+##    docker push "$targetName"
+#
+#  else
+#    echo "Docker image ${sourceName} does not exist"
+#  fi
+#done
+#done
diff --git a/.buildkite/scripts/define_module.sh b/.buildkite/scripts/define_module.sh
old mode 100644
new mode 100755
index 4e175ed9a52..d7187b58901
--- a/.buildkite/scripts/define_module.sh
+++ b/.buildkite/scripts/define_module.sh
@@ -45,11 +45,11 @@ getGitMatchingGroup() {
 
 defineModule() {
   cd "${BEAT_PATH}"
-  module=$(getGitMatchingGroup "$pattern" "$exclude")
+  NEW_MODULE=$(getGitMatchingGroup "$pattern" "$exclude")
   if [ ! -f "$BEAT_PATH/module/${module}" ]; then
-    module=''
+    NEW_MODULE=''
   fi
   cd - >/dev/null
 
-  echo "${module}"
+  export NEW_MODULE
 }
diff --git a/filebeat/filebeat_windows_amd64.syso b/filebeat/filebeat_windows_amd64.syso
deleted file mode 100644
index c52af94f8e0..00000000000
Binary files a/filebeat/filebeat_windows_amd64.syso and /dev/null differ