diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index ef01c6896..532956e1b 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -167,7 +167,7 @@ jobs:
 
       - name: 'Let sis-updater-worker run migrations, then push new version of image to toska hub'
         run: |
-          docker compose --file docker-compose.ci.yml up --detach --quiet-pull oodikone-updater-worker
+          docker compose --file docker-compose.ci.yml up --detach --quiet-pull sis-updater-worker
           sleep 30 # wait for sis-updater-worker to start and run migrations
           ./anonyymioodi/commit_and_push_to_toska_hub.sh sis-db
 
@@ -207,7 +207,7 @@ jobs:
 
       - name: 'Let backend run migrations, then push new version of image to toska hub'
         run: |
-          docker compose --file docker-compose.ci.yml up --detach oodikone-backend
+          docker compose --file docker-compose.ci.yml up --detach backend
           sleep 30 # wait for backend to start and run migrations
           ./anonyymioodi/commit_and_push_to_toska_hub.sh kone-db
 
@@ -254,7 +254,7 @@ jobs:
 
       - name: 'Let backend run migrations, then push new version of image to toska hub'
         run: |
-          docker compose --file docker-compose.ci.yml up --detach oodikone-backend
+          docker compose --file docker-compose.ci.yml up --detach backend
           sleep 30 # wait for backend to start and run migrations
           ./anonyymioodi/commit_and_push_to_toska_hub.sh user-db
 
diff --git a/.github/workflows/updater.yaml b/.github/workflows/updater.yaml
index ea78f3a6b..25e5b9877 100644
--- a/.github/workflows/updater.yaml
+++ b/.github/workflows/updater.yaml
@@ -93,24 +93,24 @@ jobs:
       - name: 'Load scheduler image'
         run: docker load --input scheduler.tar
       - name: 'Start worker'
-        run: docker compose --file docker-compose.ci.yml up --detach --no-recreate oodikone-updater-worker
+        run: docker compose --file docker-compose.ci.yml up --detach --no-recreate sis-updater-worker
       - name: 'Run hourly jobs'
-        run: docker compose --file docker-compose.ci.yml run oodikone-updater-scheduler npm start
+        run: docker compose --file docker-compose.ci.yml run sis-updater-scheduler npm start
         env:
           SCHEDULE_IMMEDIATE: hourly
           EXIT_AFTER_IMMEDIATES: yes
       - name: 'Run weekly jobs'
-        run: docker compose --file docker-compose.ci.yml run oodikone-updater-scheduler npm start
+        run: docker compose --file docker-compose.ci.yml run sis-updater-scheduler npm start
         env:
           SCHEDULE_IMMEDIATE: weekly
           EXIT_AFTER_IMMEDIATES: yes
       - name: 'Run prepurge'
-        run: docker compose --file docker-compose.ci.yml run oodikone-updater-scheduler npm start
+        run: docker compose --file docker-compose.ci.yml run sis-updater-scheduler npm start
         env:
           SCHEDULE_IMMEDIATE: prepurge
           EXIT_AFTER_IMMEDIATES: yes
       - name: 'Run purge'
-        run: docker compose --file docker-compose.ci.yml run oodikone-updater-scheduler npm start
+        run: docker compose --file docker-compose.ci.yml run sis-updater-scheduler npm start
         env:
           SCHEDULE_IMMEDIATE: purge
           EXIT_AFTER_IMMEDIATES: yes
diff --git a/README.md b/README.md
index 32e375c7e..f74ab377b 100644
--- a/README.md
+++ b/README.md
@@ -147,8 +147,8 @@ It is recommended to spend some time to become familiar with `docker` and `docke
 - `./run.sh oodikone anon pull`: pull all images related to Oodikone development
 - `./run.sh updater real up --build --force-recreate --detach`: start updater detached (in the background) in real data mode, but build new images before starting
 - `docker compose ps`: view the containers in the running environment
-- `docker compose logs oodikone-frontend`: print logs for just frontend
-- `docker compose logs --follow --tail 100 oodikone-backend`: print last hundred rows of backend logs and begin to follow them in your terminal window
+- `docker compose logs frontend`: print logs for just frontend
+- `docker compose logs --follow --tail 100 backend`: print last hundred rows of backend logs and begin to follow them in your terminal window
 - `docker exec -it oodikone-backend sh`: open bash terminal inside backend container
 - `docker exec -it oodikone-sis-db psql -U postgres sis-db-real`: open psql client to investigate sis real data database
 
diff --git a/anonyymioodi/create_container_from_dump.sh b/anonyymioodi/create_container_from_dump.sh
index 2d7e1ac6e..d84732429 100755
--- a/anonyymioodi/create_container_from_dump.sh
+++ b/anonyymioodi/create_container_from_dump.sh
@@ -53,12 +53,12 @@ fi
 
 infomsg "Restoring PostgreSQL dumps from backups. This might take a while."
 database="${args[0]}"
-docker-compose down --remove-orphans
-docker-compose up -d "$database"
+docker compose down --remove-orphans
+docker compose up -d "$database"
 
 database_dump="$database.sqz"
 infomsg "Attempting to restore database $database from dump $database_dump"
-retry docker-compose exec "oodikone-$database" pg_isready --dbname="$database"
+retry docker compose exec "$database" pg_isready --dbname="$database"
 docker exec -i "oodikone-$database" /bin/bash -c "pg_restore --username=postgres \
 --format=custom --dbname=$database --no-owner" < "$database_dump"
 successmsg "Database $database succesfully created"
diff --git a/cli.sh b/cli.sh
index 9572d0f51..767a008d3 100755
--- a/cli.sh
+++ b/cli.sh
@@ -18,11 +18,11 @@ source "$PROJECT_ROOT"/scripts/functions_for_setup.sh
 # Try to run cleanup function if things fail.
 trap cleanup SIGINT SIGTERM ERR EXIT
 
-# Run docker-compose down on cleanup
+# Run docker compose down on cleanup
 cleanup() {
   trap - SIGINT SIGTERM ERR EXIT
-  warningmsg "Trying to run docker-compose down and remove orphans"
-  docker-compose --profile oodikone --profile updater down --remove-orphans
+  warningmsg "Trying to run docker compose down and remove orphans"
+  docker compose --profile oodikone --profile updater down --remove-orphans
 }
 
 # === CLI ===
diff --git a/package.json b/package.json
index b1da9e220..d4bcc2e21 100644
--- a/package.json
+++ b/package.json
@@ -12,16 +12,17 @@
     "stylelint": "stylelint",
     "prettier": "prettier",
     "cli": "./cli.sh",
+    "logs": "docker compose --file docker-compose.yml --profile oodikone --profile updater logs -f",
     "oodikone": "./run.sh oodikone anon up --detach",
     "oodikone:real": "./run.sh oodikone real up --detach",
     "oodikone:ci:setup": "docker compose --file docker-compose.ci.yml --profile tests up --detach",
-    "oodikone:ci:api": "docker compose --file docker-compose.test.yml up --exit-code-from oodikone-api-tests",
+    "oodikone:ci:api": "docker compose --file docker-compose.test.yml up --exit-code-from api-tests",
     "updater": "./run.sh updater anon up --detach",
     "updater:real": "./run.sh updater real up --detach",
     "both": "./run.sh both anon up --detach",
     "both:real": "./run.sh both real up --detach",
     "docker:down": "./run.sh both anon down --remove-orphans; ./run.sh both real down --remove-orphans",
-    "testupdater": "docker-compose --file docker-compose.ci.yml up --detach --no-recreate oodikone-updater-worker && SCHEDULE_IMMEDIATE=weekly EXIT_AFTER_IMMEDIATES=yes docker-compose --file docker-compose.ci.yml run oodikone-updater-scheduler npm start",
+    "testupdater": "docker compose --file docker-compose.ci.yml up --detach --no-recreate sis-updater-worker && SCHEDULE_IMMEDIATE=weekly EXIT_AFTER_IMMEDIATES=yes docker compose --file docker-compose.ci.yml run sis-updater-scheduler npm start",
     "flushredis": "docker exec -it oodikone-redis redis-cli flushall",
     "prepare": "husky",
     "install:local": "npm i && npm i --prefix services/shared && npm i --prefix services/frontend && npm i --prefix services/backend && npm i --prefix updater/sis-updater-scheduler && npm i --prefix updater/sis-updater-worker",
diff --git a/run.sh b/run.sh
index 075184cae..3eb4d0eeb 100755
--- a/run.sh
+++ b/run.sh
@@ -23,7 +23,7 @@ Usage: $(basename "${BASH_SOURCE[0]}") option [version] command --flag
 Parameters:
 * Option: oodikone/updater/both
 * Version: anon/real. Not necessary when running down/logs/pull.
-* Command: will be passed to docker-compose.
+* Command: will be passed to docker compose.
 EOF
 }
 
diff --git a/scripts/functions_for_setup.sh b/scripts/functions_for_setup.sh
index fa3a1069e..741a324d6 100755
--- a/scripts/functions_for_setup.sh
+++ b/scripts/functions_for_setup.sh
@@ -12,7 +12,7 @@ DUMP_DIR="$PROJECT_ROOT/.databasedumps"
 S3_CONFIG_FILE=~/.s3cfg
 S3_BUCKET="s3://psyduck"
 
-## Following the naming convention in docker-compose, these are names for database
+## Following the naming convention in docker compose, these are names for database
 ## services. The real data databases inside service will have names suffixed by "-real".
 KONE_DB_NAME="kone-db"
 SIS_DB_NAME="sis-db"
@@ -112,7 +112,7 @@ reset_databases() {
   infomsg "Restoring PostgreSQL dumps from backups. This might take a while."
 
   npm run docker:down
-  docker-compose up -d "${databases[@]}"
+  docker compose up -d "${databases[@]}"
 
   for database in "${databases[@]}"; do
     local database_dump="$database_dump_dir/$database.sql.gz"