diff --git a/packages/app/src/index.tsx b/packages/app/src/index.tsx
index a38159a258..ed1637d2c2 100644
--- a/packages/app/src/index.tsx
+++ b/packages/app/src/index.tsx
@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-// eslint-disable-next-line monorepo/no-internal-import
-import '@backstage/cli/asset-types';
+import '@backstage/cli/asset-types/asset-types';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import App from './App';
diff --git a/plugins/github-actions/universal/index.js b/plugins/github-actions/universal.js
similarity index 100%
rename from plugins/github-actions/universal/index.js
rename to plugins/github-actions/universal.js
diff --git a/plugins/github-actions/universal/package.json b/plugins/github-actions/universal/package.json
deleted file mode 100644
index df593c690d..0000000000
--- a/plugins/github-actions/universal/package.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "main": "index.js",
-  "module": "index.js",
-  "description": "Provides code that can be shared between frontend- and backend-oriented packages"
-}
diff --git a/plugins/scaffolder-backend/src/scaffolder/stages/templater/cra/index.ts b/plugins/scaffolder-backend/src/scaffolder/stages/templater/cra/index.ts
index 61a7064dc0..7d27688c0b 100644
--- a/plugins/scaffolder-backend/src/scaffolder/stages/templater/cra/index.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/stages/templater/cra/index.ts
@@ -19,8 +19,8 @@ import { TemplaterBase, TemplaterRunOptions } from '..';
 import path from 'path';
 import { TemplaterRunResult } from '../types';
 import * as yaml from 'yaml';
-// eslint-disable-next-line monorepo/no-internal-import
 import { GITHUB_ACTIONS_ANNOTATION } from '@backstage/plugin-github-actions/universal';
+import { resolvePackagePath } from '@backstage/backend-common';
 
 export class CreateReactAppTemplater implements TemplaterBase {
   public async run(options: TemplaterRunOptions): Promise<TemplaterRunResult> {
@@ -61,7 +61,9 @@ export class CreateReactAppTemplater implements TemplaterBase {
       await fs.promises.mkdir(`${finalDir}/.github`);
       await fs.promises.mkdir(`${finalDir}/.github/workflows`);
       await fs.promises.copyFile(
-        `${__dirname}/templates/.github/workflows/main.yml`,
+        `${resolvePackagePath(
+          '@backstage/plugin-scaffolder-backend',
+        )}/templates/.github/workflows/main.yml`,
         `${finalDir}/.github/workflows/main.yml`,
       );
 
diff --git a/yarn.lock b/yarn.lock
index c31e12127d..9bc6cf9efa 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3801,17 +3801,10 @@
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
-<<<<<<< HEAD
-"@spotify/eslint-config-base@^8.1.0":
-  version "9.0.0"
-  resolved "https://registry.npmjs.org/@spotify/eslint-config-base/-/eslint-config-base-9.0.0.tgz#e122b2e6d1a11750170badc5be6774ded95953d2"
-  integrity sha512-LNGY6bBM0IlosvMIx9Ic5gqatpa5LPvrJhN4RnrUnP9oaXNLgPTKDE89p3eC5Tnh78ADdX4HD+rbHDSyP2tBgg==
-=======
 "@spotify/eslint-config-base@^8.0.0":
   version "8.0.0"
   resolved "https://registry.npmjs.org/@spotify/eslint-config-base/-/eslint-config-base-8.0.0.tgz#c3d10d8a05ad9129d579952cb80063e4c4fa216e"
   integrity sha512-07Fo+KoTMl4AaZJPD6deFnYmG634wzgeqfFcWdFlIrOLAasvWSH8Lp6ZE9cJBKuffOAy8kuEE1SwFo34+5X8bQ==
->>>>>>> 88203b2fdd686da88b4d9f5ebe3564be90bcdd37
 
 "@spotify/eslint-config-oss@^1.0.1":
   version "1.0.2"