diff --git a/config/software/gitlab-rails.rb b/config/software/gitlab-rails.rb
index 2b51ba87981b90fe5bc98b88cfcdacc466d8eab7_Y29uZmlnL3NvZnR3YXJlL2dpdGxhYi1yYWlscy5yYg==..381e5ae5c4a144c4eb6828dac0fe7f3fc829cc68_Y29uZmlnL3NvZnR3YXJlL2dpdGxhYi1yYWlscy5yYg== 100644
--- a/config/software/gitlab-rails.rb
+++ b/config/software/gitlab-rails.rb
@@ -70,6 +70,12 @@
 build do
   env = with_standard_compiler_flags(with_embedded_path)
 
+  # Remove ee code when building in CE mode from canonical source
+  if !EE && File.directory?('ee')
+    delete 'ee'
+    delete 'CHANGELOG-EE.md'
+  end
+
   # Exclude rails directory from cache
   cache_dir = File.join('/var/cache/omnibus/cache/git_cache', install_dir, 'info/exclude')
   command "echo '/embedded/service/gitlab-rails' >> #{cache_dir}"
diff --git a/gitlab-ci-config/gitlab-com.yml b/gitlab-ci-config/gitlab-com.yml
index 2b51ba87981b90fe5bc98b88cfcdacc466d8eab7_Z2l0bGFiLWNpLWNvbmZpZy9naXRsYWItY29tLnltbA==..381e5ae5c4a144c4eb6828dac0fe7f3fc829cc68_Z2l0bGFiLWNpLWNvbmZpZy9naXRsYWItY29tLnltbA== 100644
--- a/gitlab-ci-config/gitlab-com.yml
+++ b/gitlab-ci-config/gitlab-com.yml
@@ -577,7 +577,7 @@
       when: never
     - if: '$PIPELINE_TYPE =~ /TRIGGERED_CE_PIPELINE/'
       variables:
-        FOSS_ONLY: "true"
+        FOSS_ONLY: "1"
     - if: '$PIPELINE_TYPE =~ /TRIGGERED_EE_PIPELINE/'
   needs:
     - job: generate-facts