diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1dcabf00a5..e8c6abf304 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -563,7 +563,7 @@ parameters:
     default: "al-ttahub-3329-fix-event-view"
     type: string
   sandbox_git_branch: # change to feature branch to test deployment
-    default: "kw-fix-duplicate-programs"
+    default: "mb/TTAHUB-3483/checkbox-to-activity-reports"
     type: string
   prod_new_relic_app_id:
     default: "877570491"
diff --git a/Dockerfile b/Dockerfile
index e4d49b0d9b..302b29535f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,10 @@
 FROM node:18.20.3
 WORKDIR /app
 RUN apt-get update && apt-get install lcov -y
+RUN \
+    mkdir -p /home/node/.cache/yarn \
+    && chown -R node:node /home/node/.cache/yarn \
+    && mkdir -p /app/node_modules \
+    && chown -R node:node /app/node_modules
+
+
diff --git a/bin/prod-style-server b/bin/prod-style-server
index f1b74b94d0..7369894b13 100755
--- a/bin/prod-style-server
+++ b/bin/prod-style-server
@@ -25,20 +25,20 @@ fi
 
 # Run a production style build (single BE server with static FE)
 echo "Running yarn install on server..."
-docker-compose -f docker-compose.dss.yml run --rm server yarn install --production=false
+docker compose -f docker-compose.dss.yml run --rm server yarn install --production=false
 echo "Running yarn install on frontend..."
-docker-compose -f docker-compose.dss.yml run --rm server yarn --cwd frontend install --production=false
+docker compose -f docker-compose.dss.yml run --rm server yarn --cwd frontend install --production=false
 echo "Building backend..."
-docker-compose -f docker-compose.dss.yml run --rm server yarn build
+docker compose -f docker-compose.dss.yml run --rm server yarn build
 echo "Building frontend..."
-docker-compose -f docker-compose.dss.yml run --rm server yarn --cwd frontend run build
+docker compose -f docker-compose.dss.yml run --rm server yarn --cwd frontend run build
 
 # Starting services
 echo "Starting services..."
-docker-compose -f docker-compose.dss.yml up -d
+docker compose -f docker-compose.dss.yml up -d
 
 # Running database migrations
 echo "Running database migrations..."
-docker-compose -f docker-compose.dss.yml run --rm server yarn db:migrate:ci
+docker compose -f docker-compose.dss.yml run --rm server yarn db:migrate:ci
 
 echo "Server setup completed successfully."
diff --git a/bin/run-tests b/bin/run-tests
index 8b510350f1..c722780ab9 100755
--- a/bin/run-tests
+++ b/bin/run-tests
@@ -9,7 +9,7 @@ log() {
 
 check_exit() {
     if [[ "$1" -ne 0 ]]; then
-        echo "$lr last docker-compose command failed"
+        echo "$lr last docker compose command failed"
         ((exit_code++))
     fi
 }
@@ -42,19 +42,19 @@ main() {
       esac
     done
 
-    docker-compose \
+    docker compose \
         -f 'docker-compose.test.yml' \
         down --volumes --remove-orphans
 
     log "Running tests in using test config 'docker-compose.test.yml'"
     # Start containers
     if [[ $docker == "true" ]]; then
-      docker-compose -f 'docker-compose.test.yml' up -d
+      docker compose -f 'docker-compose.test.yml' up -d
       check_exit "$?"
     else
-      docker-compose -f 'docker-compose.test.yml' up -d test-db
+      docker compose -f 'docker-compose.test.yml' up -d test-db
       check_exit "$?"
-      IFS=: read host port <<< "$(docker-compose -f 'docker-compose.test.yml' port test-db 5432)"
+      IFS=: read host port <<< "$(docker compose -f 'docker-compose.test.yml' port test-db 5432)"
       echo "Postgres is running on port $port"
       export POSTGRES_PORT=$port
     fi
@@ -177,7 +177,7 @@ main() {
     # Cleanup
     echo
     log "Cleaning up test containers"
-    docker-compose \
+    docker compose \
         -f 'docker-compose.test.yml' \
         down --volumes --remove-orphans
     check_exit "$?"
diff --git a/bin/test-backend-ci b/bin/test-backend-ci
index f7ead1634d..12049143b3 100755
--- a/bin/test-backend-ci
+++ b/bin/test-backend-ci
@@ -4,7 +4,7 @@ declare -i exit_code=0
 
 check_exit() {
     if [[ "$1" -ne 0 ]]; then
-        echo "$lr last docker-compose command failed"
+        echo "$lr last docker compose command failed"
         ((exit_code++))
     fi
 }
diff --git a/docker-compose.debug.yml b/docker-compose.debug.yml
index f66e3579d5..588d3375f0 100644
--- a/docker-compose.debug.yml
+++ b/docker-compose.debug.yml
@@ -1,4 +1,3 @@
-version: "3.7"
 services:
   backend:
     build:
@@ -28,6 +27,8 @@ services:
       - PUPPETEER_SKIP_CHROMIUM_DOWNLOAD
     volumes:
       - ".:/app:rw"
+      - "node_modules-backend:/app/node_modules:rw"
+      - "yarn-cache:/home/node/.cache/yarn:rw"
     deploy:
       resources:
         limits:
@@ -43,6 +44,8 @@ services:
     volumes:
       - "./frontend:/app:rw"
       - "./scripts:/app/scripts"
+      - "node_modules-frontend:/app/node_modules:rw"
+      - "yarn-cache:/home/node/.cache/yarn:rw"
     environment:
       - BACKEND_PROXY=http://backend:8080
   worker:
@@ -59,3 +62,5 @@ services:
       - SMTP_HOST=mailcatcher
     volumes:
       - ".:/app:rw"
+      - "node_modules-backend:/app/node_modules:rw"
+      - "yarn-cache:/home/node/.cache/yarn:rw"
diff --git a/docker-compose.dss.yml b/docker-compose.dss.yml
index eff6c8809f..b9bbdb18a0 100644
--- a/docker-compose.dss.yml
+++ b/docker-compose.dss.yml
@@ -1,4 +1,3 @@
-version: "3.2"
 services:
   server:
     build:
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index a96aebee71..e1af9c2ddf 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -1,8 +1,9 @@
-version: "3.7"
 services:
   backend:
     build:
       context: .
+    profiles:
+      - minimal_required
     command: yarn server
     user: ${CURRENT_USER:-root}
     ports:
@@ -28,9 +29,13 @@ services:
       - PUPPETEER_SKIP_CHROMIUM_DOWNLOAD
     volumes:
       - ".:/app:rw"
+      - "node_modules-backend:/app/node_modules:rw"
+      - "yarn-cache:/home/node/.cache/yarn:rw"
   frontend:
     build:
       context: .
+    profiles:
+      - minimal_required
     command: yarn start
     user: ${CURRENT_USER:-root}
     stdin_open: true
@@ -40,12 +45,16 @@ services:
       - "./frontend:/app:rw"
       - "./scripts:/app/scripts"
       - "./packages:/packages:ro"
+      - "node_modules-frontend:/app/node_modules:rw"
+      - "yarn-cache:/home/node/.cache/yarn:rw"
     environment:
       - BACKEND_PROXY=http://backend:8080
       - REACT_APP_WEBSOCKET_URL
   worker:
     build:
       context: .
+    profiles:
+      - minimal_required
     command: yarn worker
     env_file: .env
     depends_on:
@@ -57,8 +66,12 @@ services:
       - SMTP_HOST=mailcatcher
     volumes:
       - ".:/app:rw"
+      - "node_modules-backend:/app/node_modules:rw"
+      - "yarn-cache:/home/node/.cache/yarn:rw"
   owasp_zap_backend:
     image: softwaresecurityproject/zap-stable:latest
+    profiles:
+      - full_stack
     platform: linux/arm64
     user: zap
     command: zap-full-scan.py -t http://backend:8080 -c zap.conf  -i -r owasp_report_.html
@@ -69,6 +82,8 @@ services:
       - backend
   owasp_zap_similarity:
     image: softwaresecurityproject/zap-stable:latest
+    profiles:
+      - full_stack
     platform: linux/arm64
     user: zap
     command: zap-api-scan.py -t http://similarity:8080/openapi.json -f openapi -I -i -r owasp_api_report.html
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index 0410c967f4..0f4aa54379 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -1,4 +1,3 @@
-version: "3.5"
 services:
   test-backend:
     build:
@@ -15,6 +14,8 @@ services:
       - "${ITAMS_MD_HOST:-sftp.itams.ohs.acf.hhs.gov}:0.0.0.0"
     volumes:
       - ".:/app:rw"
+      - "node_modules-backend:/app/node_modules:rw"
+      - "yarn-cache:/home/node/.cache/yarn:rw"
     networks:
       - ttadp-test
   test-frontend:
@@ -27,6 +28,8 @@ services:
     volumes:
       - "./frontend:/app:rw"
       - "./scripts:/app/scripts"
+      - "node_modules-frontend:/app/node_modules:rw"
+      - "yarn-cache:/home/node/.cache/yarn:rw"
     environment:
       - BACKEND_PROXY=http://test-backend:8080
       - REACT_APP_WEBSOCKET_URL
diff --git a/docker-compose.yml b/docker-compose.yml
index 5fa3c630ad..1931e66c4e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,8 @@
-version: "3.7"
 services:
   api-docs:
     image: redocly/redoc
+    profiles:
+      - full_stack
     ports:
       - "5003:80"
     volumes:
@@ -12,6 +13,8 @@ services:
     image: postgres:15.6
     container_name: postgres_docker
     env_file: .env
+    profiles:
+      - minimal_required
     ports:
       - "5432:5432"
     volumes:
@@ -19,6 +22,8 @@ services:
     shm_size: 1g
   minio:
     image: minio/minio:RELEASE.2024-01-01T16-36-33Z
+    profiles:
+      - full_stack
     env_file: .env
     ports:
       - "9000:9000"
@@ -28,12 +33,16 @@ services:
     command: server /data --console-address ":9001"
   aws-cli:
     image: amazon/aws-cli
+    profiles:
+      - full_stack
     env_file: .env
     command: ["--endpoint-url", "http://minio:9000", "s3api", "create-bucket", "--bucket", "$S3_BUCKET"]
     depends_on:
       - minio
   clamav-rest:
     image: ajilaag/clamav-rest
+    profiles:
+      - full_stack
     ports:
       - "9443:9443"
     environment:
@@ -41,6 +50,8 @@ services:
   similarity_api:
     build:
       context: ./similarity_api
+    profiles:
+      - minimal_required
     ports:
       - "9100:8080"
     env_file: .env
@@ -50,18 +61,24 @@ services:
       - "./similarity_api/src:/app:rw"
   redis:
     image: redis:5.0.6-alpine
+    profiles:
+      - minimal_required
     command: ['redis-server', '--requirepass', '$REDIS_PASS']
     env_file: .env
     ports:
       - "6379:6379"
   mailcatcher:
     image: schickling/mailcatcher
+    profiles:
+      - full_stack
     ports:
       - "1025:1025"
       - "1080:1080"
   testingonly:
     build:
       context: .
+    profiles:
+      - full_stack
     ports:
       - "9999:9999"
     depends_on:
@@ -74,6 +91,8 @@ services:
       - NODE_ENV=development
   sftp:
     image: jmcombs/sftp:alpine
+    profiles:
+      - full_stack
     volumes:
         - ./test-sftp:/home/tta_ro/ProdTTAHome
         - ./test-sftp/sshd_config:/etc/ssh/sshd_config
@@ -83,3 +102,6 @@ services:
 volumes:
   dbdata: {}
   minio-data: {}
+  yarn-cache: {}
+  node_modules-backend: {}
+  node_modules-frontend: {}
\ No newline at end of file
diff --git a/docs/testing.md b/docs/testing.md
index 5268d7fe57..2e5022f7f5 100644
--- a/docs/testing.md
+++ b/docs/testing.md
@@ -38,11 +38,11 @@ By default, `./bin/run-tests` will run both backend and frontend tests. If you w
 
 When running tests in Docker, be aware that there are tests that will modify/delete database records. For tests to run, the 'db' service needs to exist and `db:migrate` and `db:seed` need to have been run (to create the tables and populate certain records).
 
-In the `docker-compose.yml` configuration, the database is set up to persist to a volume, "dbdata", so database records will persist between runs of the 'db' service, unless you remove that volume explicitly (e.g. `docker volume rm` or `docker-compose down --volumes`).
+In the `docker-compose.yml` configuration, the database is set up to persist to a volume, "dbdata", so database records will persist between runs of the 'db' service, unless you remove that volume explicitly (e.g. `docker volume rm` or `docker compose down --volumes`).
 
 
-### Notes on docker-compose and multiple configurations
+### Notes on docker compose and multiple configurations
 
-`docker-compose` has a feature for providing multiple `docker-compose.*.yml` files where subsequent files can override settings in previous files, which sounds like it would suit the use case of running docker for local development and for testing. However, the ability to [override configurations](https://docs.docker.com/compose/extends/#adding-and-overriding-configuration) is limited. While experimenting with overrides, it became clear that doing so would require a minimum of three docker-compose.yml files: one "base", one for local development, one for running tests. Trying to compose docker-compose.yml files would be complicated.
+`docker compose` has a feature for providing multiple `docker-compose.*.yml` files where subsequent files can override settings in previous files, which sounds like it would suit the use case of running docker for local development and for testing. However, the ability to [override configurations](https://docs.docker.com/compose/extends/#adding-and-overriding-configuration) is limited. While experimenting with overrides, it became clear that doing so would require a minimum of three docker-compose.yml files: one "base", one for local development, one for running tests. Trying to compose docker-compose.yml files would be complicated.
 
 In addition, while experimenting with multiple configuration files, it became clear that docker was unable to differentiate between different versions of the same service. Trying to override the 'db' service for testing would not work as expected: if the local/dev 'db' service had already been created, that one would be used when tests were run.
diff --git a/frontend/package.json b/frontend/package.json
index 008be04d53..e54b30297c 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -25,7 +25,7 @@
     "follow-redirects": "^1.15.6",
     "html-to-draftjs": "^1.5.0",
     "html2canvas": "^1.4.1",
-    "http-proxy-middleware": "^2.0.1",
+    "http-proxy-middleware": "^2.0.7",
     "lodash": "^4.17.20",
     "minimist": "^1.2.6",
     "moment": "^2.29.4",
diff --git a/frontend/src/pages/ActivityReport/Pages/components/GoalPicker.js b/frontend/src/pages/ActivityReport/Pages/components/GoalPicker.js
index cd246f2c04..e5755b7eac 100644
--- a/frontend/src/pages/ActivityReport/Pages/components/GoalPicker.js
+++ b/frontend/src/pages/ActivityReport/Pages/components/GoalPicker.js
@@ -2,7 +2,7 @@ import React, { useState, useEffect, useRef } from 'react';
 import { v4 as uuidv4 } from 'uuid';
 import { uniqBy } from 'lodash';
 import PropTypes from 'prop-types';
-import { Label, Button } from '@trussworks/react-uswds';
+import { Label, Button, Checkbox } from '@trussworks/react-uswds';
 import { useFormContext, useWatch, useController } from 'react-hook-form';
 import Select from 'react-select';
 import { getTopics } from '../../../../fetchers/topics';
@@ -41,7 +41,10 @@ const components = {
 };
 
 const GoalPicker = ({
-  availableGoals, grantIds, reportId,
+  availableGoals,
+  grantIds,
+  reportId,
+  goalTemplates,
 }) => {
   const {
     control, setValue, watch,
@@ -51,6 +54,7 @@ const GoalPicker = ({
   // to re-render appropriately
   const [datePickerKey, setDatePickerKey] = useState('DPKEY-00');
   const [templatePrompts, setTemplatePrompts] = useState(false);
+  const [useOhsStandardGoal, setOhsStandardGoal] = useState(false);
   const activityRecipientType = watch('activityRecipientType');
 
   const selectedGoals = useWatch({ name: 'goals' });
@@ -178,6 +182,9 @@ const GoalPicker = ({
     onChangeGoal(goal);
   };
 
+  const pickerLabel = useOhsStandardGoal ? 'Select OHS standard goal' : 'Select recipient\'s goal';
+  const pickerOptions = useOhsStandardGoal ? goalTemplates : options;
+
   return (
     <>
       <Modal
@@ -197,8 +204,7 @@ const GoalPicker = ({
       </Modal>
       <div className="margin-top-3 position-relative">
         <Label>
-          Select recipient&apos;s goal&nbsp;
-          {'   '}
+          {pickerLabel}
           <Req />
           <Select
             name="goalForEditing"
@@ -209,7 +215,7 @@ const GoalPicker = ({
               validate: validateGoals,
             }}
             className="usa-select"
-            options={options}
+            options={pickerOptions}
             styles={{
               ...selectOptionsReset,
               option: (provided) => ({
@@ -222,6 +228,14 @@ const GoalPicker = ({
             required
           />
         </Label>
+        <Checkbox
+          label="Use OHS standard goal"
+          id="useOhsStandardGoal"
+          name="useOhsStandardGoal"
+          checked={useOhsStandardGoal}
+          className="margin-top-1"
+          onChange={() => setOhsStandardGoal(!useOhsStandardGoal)}
+        />
         {goalForEditing ? (
           <div>
             <GoalForm
@@ -241,6 +255,18 @@ const GoalPicker = ({
 };
 
 GoalPicker.propTypes = {
+  goalTemplates: PropTypes.arrayOf(PropTypes.shape({
+    id: PropTypes.number,
+    name: PropTypes.string,
+    goalIds: PropTypes.arrayOf(PropTypes.number),
+    goalTemplateId: PropTypes.number,
+    objectives: PropTypes.arrayOf(PropTypes.shape({
+      id: PropTypes.number,
+      name: PropTypes.string,
+      description: PropTypes.string,
+      goalId: PropTypes.number,
+    })),
+  })).isRequired,
   grantIds: PropTypes.arrayOf(PropTypes.number).isRequired,
   availableGoals: PropTypes.arrayOf(PropTypes.shape({
     label: PropTypes.string,
diff --git a/frontend/src/pages/ActivityReport/Pages/components/__tests__/GoalPicker.js b/frontend/src/pages/ActivityReport/Pages/components/__tests__/GoalPicker.js
index f68846210a..f64c9903ab 100644
--- a/frontend/src/pages/ActivityReport/Pages/components/__tests__/GoalPicker.js
+++ b/frontend/src/pages/ActivityReport/Pages/components/__tests__/GoalPicker.js
@@ -3,6 +3,8 @@ import '@testing-library/jest-dom';
 import {
   render,
   screen,
+  act,
+  fireEvent,
 } from '@testing-library/react';
 import React from 'react';
 import fetchMock from 'fetch-mock';
@@ -27,8 +29,8 @@ const defaultGoalForEditing = {
   goalIds: [],
 };
 
-// eslint-disable-next-line react/prop-types
-const GP = ({ availableGoals, selectedGoals, goalForEditing }) => {
+// eslint-disable-next-line react/prop-types, object-curly-newline
+const GP = ({ availableGoals, selectedGoals, goalForEditing, goalTemplates }) => {
   const hookForm = useForm({
     mode: 'onChange',
     defaultValues: {
@@ -57,7 +59,7 @@ const GP = ({ availableGoals, selectedGoals, goalForEditing }) => {
         <FormProvider {...hookForm}>
           <GoalPicker
             availableGoals={availableGoals}
-            roles={['central office']}
+            goalTemplates={goalTemplates}
             grantIds={[]}
             reportId={1}
           />
@@ -71,12 +73,14 @@ const renderGoalPicker = (
   availableGoals,
   selectedGoals = defaultSelectedGoals,
   goalForEditing = defaultGoalForEditing,
+  goalTemplates = [],
 ) => {
   render(
     <GP
       availableGoals={availableGoals}
       selectedGoals={selectedGoals}
       goalForEditing={goalForEditing}
+      goalTemplates={goalTemplates}
     />,
   );
 };
@@ -221,9 +225,64 @@ describe('GoalPicker', () => {
     expect(selector).toBeVisible();
   });
 
+  describe('with checkbox', () => {
+    it('you can toggle the list of curated goals', async () => {
+      fetchMock.get('/api/goal-templates/1/prompts?goalIds=1', []);
+      fetchMock.get('/api/goal-templates/1/prompts', []);
+      const availableGoals = [];
+
+      renderGoalPicker(availableGoals, null, null, [
+        {
+          id: 1,
+          goalTemplateId: 1,
+          name: 'Goal Template 1',
+          label: 'Goal Template 1',
+          goals: [],
+          isCurated: true,
+          objectives: [],
+          value: 1,
+          source: '',
+        },
+      ]);
+
+      let selector = screen.queryByLabelText(/Select recipient's goal*/i);
+      expect(selector).toBeVisible();
+
+      const checkbox = await screen.findByLabelText(/use ohs standard goal/i);
+      act(() => {
+        userEvent.click(checkbox);
+      });
+
+      selector = screen.queryByLabelText(/Select recipient's goal*/i);
+      expect(selector).toBeNull();
+
+      selector = await screen.findByLabelText(/Select ohs standard goal/i);
+
+      fireEvent.focus(selector);
+      fireEvent.keyDown(selector, {
+        key: 'ArrowDown',
+        keyCode: 40,
+        code: 40,
+      });
+
+      const option = await screen.findByText('Goal Template 1');
+      expect(option).toBeVisible();
+    });
+  });
+
   describe('curated goals', () => {
     it('with no prompts', async () => {
-      fetchMock.get('/api/goal-templates/1/prompts?goalIds=1', []);
+      fetchMock.get('/api/goal-templates/1/prompts?goalIds=1', [
+        {
+          type: 'multiselect',
+          title: 'prompt-1',
+          options: [
+            'Option 1',
+            'Option 2',
+          ],
+          prompt: 'WHYYYYYYYY?',
+        },
+      ]);
       const availableGoals = [{
         label: 'Goal 1',
         value: 1,
@@ -239,7 +298,7 @@ describe('GoalPicker', () => {
 
       await selectEvent.select(selector, [availableGoal.label]);
 
-      const input = document.querySelector('[name="goalForEditing"');
+      const input = document.querySelector('[name="goalForEditing"]');
       expect(input.value).toBe(availableGoal.value.toString());
     });
     it('with prompts', async () => {
@@ -269,7 +328,7 @@ describe('GoalPicker', () => {
 
       await selectEvent.select(selector, [availableGoal.label]);
 
-      const input = document.querySelector('[name="goalForEditing"');
+      const input = document.querySelector('[name="goalForEditing"]');
       expect(input.value).toBe(availableGoal.value.toString());
     });
   });
diff --git a/frontend/src/pages/ActivityReport/Pages/goalsObjectives.js b/frontend/src/pages/ActivityReport/Pages/goalsObjectives.js
index 982dbb36d3..57ca8d1494 100644
--- a/frontend/src/pages/ActivityReport/Pages/goalsObjectives.js
+++ b/frontend/src/pages/ActivityReport/Pages/goalsObjectives.js
@@ -1,7 +1,9 @@
 /* eslint-disable react/jsx-props-no-spreading */
 // disabling prop spreading to use the "register" function from react hook form the same
 // way they did in their examples
-import React, { useState, useContext } from 'react';
+import React, {
+  useState, useContext, useMemo,
+} from 'react';
 import PropTypes from 'prop-types';
 import { Helmet } from 'react-helmet';
 import { Alert, Fieldset, Button } from '@trussworks/react-uswds';
@@ -99,19 +101,31 @@ const GoalsObjectives = ({
   const activityRecipients = watch('activityRecipients');
   const objectivesWithoutGoals = watch('objectivesWithoutGoals');
   const pageState = getValues('pageState');
-  const isRecipientReport = activityRecipientType === 'recipient';
-  const isOtherEntityReport = activityRecipientType === 'other-entity';
-  const grantIds = isRecipientReport ? activityRecipients.map((r) => {
-    if (r.grant) {
-      return r.grant.id;
-    }
 
-    return r.activityRecipientId;
-  }) : [];
+  const {
+    isRecipientReport,
+    grantIds,
+  } = useMemo(() => {
+    const isRecipient = activityRecipientType === 'recipient';
+    const grants = isRecipient ? activityRecipients.map((r) => {
+      if (r.grant) {
+        return r.grant.id;
+      }
+      return r.activityRecipientId;
+    }) : [];
+
+    return {
+      isRecipientReport: isRecipient,
+      grantIds: grants,
+    };
+  }, [activityRecipientType, activityRecipients]);
+
+  const isOtherEntityReport = activityRecipientType === 'other-entity';
   const activityRecipientIds = activityRecipients.map((r) => r.activityRecipientId);
 
   const [fetchError, setFetchError] = useState(false);
   const [availableGoals, updateAvailableGoals] = useState([]);
+  const [goalTemplates, setGoalTemplates] = useState([]);
   const hasGrants = grantIds.length > 0;
 
   const {
@@ -129,12 +143,38 @@ const GoalsObjectives = ({
     defaultValue: [],
   });
 
+  useDeepCompareEffect(() => {
+    const fetchGoalTemplates = async () => {
+      if (isRecipientReport && hasGrants) {
+        try {
+          const fetchedGoalTemplates = await getGoalTemplates(grantIds);
+
+          // format goalTemplates
+          const formattedGoalTemplates = fetchedGoalTemplates.map((gt) => ({
+            ...gt,
+            isCurated: true,
+            goalIds: gt.goals.map((g) => g.id),
+            goalTemplateId: gt.id,
+            isNew: gt.goals.length === 0,
+            objectives: [],
+          }));
+
+          setGoalTemplates(formattedGoalTemplates);
+        } catch (err) {
+        // eslint-disable-next-line no-console
+          console.error(err);
+        }
+      }
+    };
+
+    fetchGoalTemplates();
+  }, [grantIds, hasGrants, isRecipientReport]);
+
   useDeepCompareEffect(() => {
     const fetch = async () => {
       try {
         if (isRecipientReport && hasGrants) {
           const fetchedGoals = await getGoals(grantIds);
-          const fetchedGoalTemplates = await getGoalTemplates(grantIds);
           const formattedGoals = fetchedGoals.map((g) => {
             // if the goal is on an "old" grant, we should
             // treat it like a new goal for now
@@ -147,12 +187,7 @@ const GoalsObjectives = ({
             return { ...g, isNew, grantIds };
           });
 
-          const goalNames = formattedGoals.map((g) => g.name);
-
-          updateAvailableGoals([
-            ...fetchedGoalTemplates.filter((g) => !goalNames.includes(g.name)),
-            ...formattedGoals,
-          ]);
+          updateAvailableGoals(formattedGoals);
         }
 
         setFetchError(false);
@@ -161,7 +196,7 @@ const GoalsObjectives = ({
       }
     };
     fetch();
-  }, [grantIds]);
+  }, [grantIds, hasGrants, isRecipientReport]);
 
   const showGoals = isRecipientReport && hasGrants;
 
@@ -362,6 +397,7 @@ const GoalsObjectives = ({
                 grantIds={grantIds}
                 availableGoals={availableGoals}
                 reportId={reportId}
+                goalTemplates={goalTemplates}
               />
             </Fieldset>
           </>
diff --git a/frontend/src/pages/ActivityReport/__tests__/index.js b/frontend/src/pages/ActivityReport/__tests__/index.js
index ef77060734..d59fc0d7a1 100644
--- a/frontend/src/pages/ActivityReport/__tests__/index.js
+++ b/frontend/src/pages/ActivityReport/__tests__/index.js
@@ -662,6 +662,7 @@ describe('ActivityReport', () => {
     it('loads goals in edit mode', async () => {
       const data = formData();
       fetchMock.get('/api/topic', []);
+      fetchMock.get('/api/goal-templates?grantIds=12539', []);
       fetchMock.get('/api/activity-reports/goals?grantIds=12539', []);
       fetchMock.get('/api/goals?reportId=1&goalIds=37499', mockGoalsAndObjectives(true));
       fetchMock.get('/api/activity-reports/1', {
@@ -694,6 +695,7 @@ describe('ActivityReport', () => {
     it('loads goals in read-only mode', async () => {
       const data = formData();
       fetchMock.get('/api/topic', []);
+      fetchMock.get('/api/goal-templates?grantIds=12539', []);
       fetchMock.get('/api/activity-reports/goals?grantIds=12539', []);
       // fetchMock.get('/api/goals?reportId=1&goalIds=37499', mockGoalsAndObjectives(true));
       fetchMock.get('/api/activity-reports/1', {
diff --git a/frontend/src/pages/ActivityReport/formDataHelpers.js b/frontend/src/pages/ActivityReport/formDataHelpers.js
index 087d6870bb..be5d9fc84d 100644
--- a/frontend/src/pages/ActivityReport/formDataHelpers.js
+++ b/frontend/src/pages/ActivityReport/formDataHelpers.js
@@ -114,6 +114,7 @@ export const packageGoals = (goals, goal, grantIds, prompts) => {
       name: g.name,
       grantIds,
       id: g.id,
+      goalTemplateId: g.goalTemplateId,
       isActivelyBeingEditing: false,
       prompts: grantIds.length < 2 ? g.prompts : [],
       objectives: g.objectives.map((objective) => ({
@@ -143,6 +144,7 @@ export const packageGoals = (goals, goal, grantIds, prompts) => {
       source: goal.source,
       name: goal.name,
       isActivelyBeingEditing: goal.isActivelyBeingEditing,
+      goalTemplateId: goal.goalTemplateId,
       objectives: goal.objectives.map((objective) => ({
         id: objective.id,
         isNew: objective.isNew,
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index a43b6c8cc6..23e527db88 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -6930,10 +6930,10 @@ http-proxy-agent@^4.0.1:
     agent-base "6"
     debug "4"
 
-http-proxy-middleware@^2.0.1, http-proxy-middleware@^2.0.3:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz#e1a4dd6979572c7ab5a4e4b55095d1f32a74963f"
-  integrity sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==
+http-proxy-middleware@^2.0.3, http-proxy-middleware@^2.0.7:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz#915f236d92ae98ef48278a95dedf17e991936ec6"
+  integrity sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==
   dependencies:
     "@types/http-proxy" "^1.17.8"
     http-proxy "^1.18.1"
diff --git a/package.json b/package.json
index facdc83bf6..32342234c9 100644
--- a/package.json
+++ b/package.json
@@ -52,29 +52,31 @@
     "db:seed:prod": "node_modules/.bin/sequelize db:seed:all --options-path .production.sequelizerc",
     "db:seed:undo": "node_modules/.bin/sequelize db:seed:undo:all",
     "db:seed:undo:prod": "node_modules/.bin/sequelize db:seed:undo:all --options-path .production.sequelizerc",
-    "docker:deps": "docker-compose run --rm backend yarn install && docker-compose run --rm frontend yarn install",
+    "docker:deps": "docker compose run --rm backend yarn install && docker compose run --rm frontend yarn install && docker compose run --rm worker yarn install",
     "docker:reset": "./bin/reset-all",
-    "docker:start": "docker-compose up",
-    "docker:start:debug": "docker-compose --compatibility -f docker-compose.yml -f docker-compose.debug.yml up",
-    "docker:stop": "docker-compose down",
-    "docker:dbs:start": "docker-compose -f 'docker-compose.yml' up",
-    "docker:dbs:stop": "docker-compose -f 'docker-compose.yml' down",
+    "docker:start": "docker compose --profile minimal_required up",
+    "docker:start:full": "docker compose --profile full_stack --profile minimal_required up",
+    "docker:stop:full": "docker compose --profile full_stack --profile minimal_required down",
+    "docker:start:debug": "docker compose --compatibility -f docker-compose.yml -f docker-compose.debug.yml up",
+    "docker:stop": "docker compose --profile minimal_required down",
+    "docker:dbs:start": "docker compose -f 'docker-compose.yml' up",
+    "docker:dbs:stop": "docker compose -f 'docker-compose.yml' down",
     "docker:test": "./bin/run-tests",
-    "docker:test:be": "docker-compose run --rm backend yarn test",
-    "docker:lint": "docker-compose run --rm backend yarn lint:ci && docker-compose run --rm frontend yarn lint:ci",
-    "docker:lint:fix": "docker-compose run --rm backend yarn lint:fix && docker-compose run --rm frontend yarn lint:fix",
-    "docker:shell:frontend": "docker-compose run --rm frontend /bin/bash",
-    "docker:shell:backend": "docker-compose run --rm backend /bin/bash",
-    "docker:db:migrate": "docker-compose run --rm backend node_modules/.bin/sequelize db:migrate && yarn docker:ldm",
-    "docker:db:migrate:undo": "docker-compose run --rm backend node_modules/.bin/sequelize db:migrate:undo",
-    "docker:db:seed": "docker-compose run --rm backend yarn db:seed",
-    "docker:db:seed:undo": "docker-compose run --rm backend yarn db:seed:undo",
-    "docker:import:system": "docker-compose run --rm backend yarn import:system",
-    "docker:ldm": "docker-compose run --rm backend yarn ldm",
-    "docker:makecolors": "docker-compose run --rm frontend yarn makecolors",
-    "docker:yarn": "docker-compose run yarn",
-    "docker:yarn:fe": "docker-compose run --rm frontend  yarn",
-    "docker:yarn:be": "docker-compose run --rm backend yarn",
+    "docker:test:be": "docker compose run --rm backend yarn test",
+    "docker:lint": "docker compose run --rm backend yarn lint:ci && docker compose run --rm frontend yarn lint:ci",
+    "docker:lint:fix": "docker compose run --rm backend yarn lint:fix && docker compose run --rm frontend yarn lint:fix",
+    "docker:shell:frontend": "docker compose run --rm frontend /bin/bash",
+    "docker:shell:backend": "docker compose run --rm backend /bin/bash",
+    "docker:db:migrate": "docker compose run --rm backend node_modules/.bin/sequelize db:migrate && yarn docker:ldm",
+    "docker:db:migrate:undo": "docker compose run --rm backend node_modules/.bin/sequelize db:migrate:undo",
+    "docker:db:seed": "docker compose run --rm backend yarn db:seed",
+    "docker:db:seed:undo": "docker compose run --rm backend yarn db:seed:undo",
+    "docker:import:system": "docker compose run --rm backend yarn import:system",
+    "docker:ldm": "docker compose run --rm backend yarn ldm",
+    "docker:makecolors": "docker compose run --rm frontend yarn makecolors",
+    "docker:yarn": "docker compose run yarn",
+    "docker:yarn:fe": "docker compose run --rm frontend  yarn",
+    "docker:yarn:be": "docker compose run --rm backend yarn",
     "import:reports:local": "./node_modules/.bin/babel-node ./src/tools/importSSActivityReports.js",
     "import:reports": "node ./build/server/src/tools/importSSActivityReports.js",
     "import:goals:local": "./node_modules/.bin/babel-node ./src/tools/importTTAPlanGoals.js",
diff --git a/src/goalServices/goals.js b/src/goalServices/goals.js
index 18323a382d..45d681a283 100644
--- a/src/goalServices/goals.js
+++ b/src/goalServices/goals.js
@@ -740,7 +740,6 @@ export async function goalsForGrants(grantIds) {
       'endDate',
       'source',
       'createdVia',
-      [sequelize.fn('BOOL_OR', sequelize.literal(`"goalTemplate"."creationMethod" = '${CREATION_METHOD.CURATED}'`)), 'isCurated'],
     ],
     group: ['"Goal"."name"', '"Goal"."status"', '"Goal"."endDate"', '"Goal"."onApprovedAR"', '"Goal"."source"', '"Goal"."createdVia"', '"Goal".id'],
     where: {
@@ -770,13 +769,7 @@ export async function goalsForGrants(grantIds) {
         required: false,
       },
     ],
-    order: [[sequelize.fn(
-      'MAX',
-      sequelize.fn(
-        'DISTINCT',
-        sequelize.col('"Goal"."createdAt"'),
-      ),
-    ), 'desc']],
+    order: [['name', 'asc']],
   });
 }
 
@@ -1253,6 +1246,7 @@ export async function saveGoalsForReport(goals, report) {
         prompts,
         source,
         grant,
+        goalTemplateId,
         grantId: discardedGrantId,
         id, // we can't be trying to set this
         endDate: discardedEndDate, // get this outta here
@@ -1264,6 +1258,33 @@ export async function saveGoalsForReport(goals, report) {
         (goalIds || []).includes(extantGoal.id) && extantGoal.grantId === grantId
       ));
 
+      // let's check for goal by template ID first
+      if (!newOrUpdatedGoal && goalTemplateId) {
+        newOrUpdatedGoal = await Goal.findOne({
+          where: {
+            goalTemplateId,
+            grantId,
+            status: { [Op.not]: GOAL_STATUS.CLOSED },
+          },
+        });
+
+        // if we don't find one, we check to see if that template is curated
+        if (!newOrUpdatedGoal) {
+          const goalTemplate = await GoalTemplate.findByPk(goalTemplateId);
+          // if the template is curated, we do not want to go to the next step,
+          // where we look up a goal with a matching name, as this can have inconsistent results
+          // instead: we create a new goal
+          if (goalTemplate && goalTemplate.creationMethod === CREATION_METHOD.CURATED) {
+            newOrUpdatedGoal = await Goal.create({
+              goalTemplateId,
+              name: goal.name ? goal.name.trim() : '',
+              grantId,
+              status,
+            }, { individualHooks: true });
+          }
+        }
+      }
+
       // if not, does it exist for this name and grantId combination
       if (!newOrUpdatedGoal) {
         newOrUpdatedGoal = await Goal.findOne({
diff --git a/src/goalServices/reduceGoals.ts b/src/goalServices/reduceGoals.ts
index a09a7a5436..1e54830242 100644
--- a/src/goalServices/reduceGoals.ts
+++ b/src/goalServices/reduceGoals.ts
@@ -139,22 +139,23 @@ export function reduceObjectivesForActivityReport(
       ? objective.activityReportObjectives[0].supportType : null;
 
     const objectiveCreatedHere = objective.activityReportObjectives
-        && objective.activityReportObjectives[0]
-        && objective.activityReportObjectives[0].objectiveCreatedHere
-      ? objective.activityReportObjectives[0].objectiveCreatedHere : null;
+        && objective.activityReportObjectives.some((aro) => aro.objectiveCreatedHere) ? true : null;
 
     // objectives represent the accumulator in the find below
     // objective is the objective as it is returned from the API
     const exists = objectives.find((o) => (
       o.title.trim() === objective.title.trim()
       && o.status === objectiveStatus
-      && o.objectiveCreatedHere === objectiveCreatedHere
     ));
 
     if (exists) {
       const { id } = objective;
       exists.ids = [...exists.ids, id];
 
+      if (objectiveCreatedHere && !exists.objectiveCreatedHere) {
+        exists.objectiveCreatedHere = true;
+      }
+
       // we can dedupe these using lodash
       exists.resources = reduceRelationThroughActivityReportObjectives(
         objective,
diff --git a/src/migrations/20241016000001-fix-pfmo-to-pmfo.js b/src/migrations/20241016000001-fix-pfmo-to-pmfo.js
new file mode 100644
index 0000000000..0e0dfd129d
--- /dev/null
+++ b/src/migrations/20241016000001-fix-pfmo-to-pmfo.js
@@ -0,0 +1,63 @@
+const { prepMigration } = require('../lib/migration');
+
+/** @type {import('sequelize-cli').Migration} */
+module.exports = {
+  async up(queryInterface) {
+    await queryInterface.sequelize.transaction(async (transaction) => {
+      const sessionSig = __filename;
+      await prepMigration(queryInterface, transaction, sessionSig);
+      return queryInterface.sequelize.query(`
+        -- There are still two places the PMFO national center name was erroneously
+        -- recorded as PFMO:
+        -- - EventReportPilotNationalCenterUsers.nationalCenterName
+        -- - SessionReportPilots.data->objectiveTrainers
+
+        DROP TABLE IF EXISTS corrected_erpncu;
+        CREATE TEMP TABLE corrected_erpncu
+        AS
+        WITH updater AS (
+        UPDATE "EventReportPilotNationalCenterUsers"
+        SET "nationalCenterName" = 'PMFO'
+        WHERE "nationalCenterName" = 'PFMO'
+        RETURNING id
+        )
+        SELECT * FROM UPDATER
+        ;
+
+        DROP TABLE IF EXISTS corrected_srp;
+        CREATE TEMP TABLE corrected_srp
+        AS
+        WITH updater AS (
+        UPDATE "SessionReportPilots"
+        SET data = regexp_replace(data::text,'PFMO','PMFO')::jsonb
+        RETURNING id
+        )
+        SELECT * FROM UPDATER
+        ;
+
+        DROP TABLE IF EXISTS corrected_erp;
+        CREATE TEMP TABLE corrected_erp
+        AS
+        WITH updater AS (
+        UPDATE "EventReportPilots"
+        SET data = regexp_replace(data::text,'PFMO','PMFO')::jsonb
+        RETURNING id
+        )
+        SELECT * FROM UPDATER
+        ;
+
+        SELECT 'fixed EventReportPilotNationalCenterUsers' operation, COUNT(*) cnt FROM corrected_erpncu
+        UNION
+        SELECT 'fixed SessionReportPilots', COUNT(*) FROM corrected_srp
+        UNION
+        SELECT 'fixed EventReportPilots', COUNT(*) FROM corrected_erp
+        ;
+
+      `);
+    });
+  },
+
+  async down() {
+    // no rollbacks
+  },
+};
diff --git a/tests/api/activityReport.spec.ts b/tests/api/activityReport.spec.ts
index 417f8b8a22..fbd540fe36 100644
--- a/tests/api/activityReport.spec.ts
+++ b/tests/api/activityReport.spec.ts
@@ -16,7 +16,6 @@ test.describe('get /activity-reports/goals', () => {
       onApprovedAR: Joi.boolean().required(),
       endDate: Joi.any().required(),
       source: Joi.any(),
-      isCurated: Joi.boolean().required(),
       createdVia: Joi.any(),
     });
     expect(response.status()).toBe(200);