diff --git a/makefiles/docker/alpine/cpp.Dockerfile b/makefiles/docker/alpine/cpp.Dockerfile
index ab8eaf1c57..6b4660182e 100644
--- a/makefiles/docker/alpine/cpp.Dockerfile
+++ b/makefiles/docker/alpine/cpp.Dockerfile
@@ -7,10 +7,10 @@ COPY . .
 
 FROM devel AS build
 RUN make third_party BUILD_DOTNET=OFF BUILD_JAVA=OFF BUILD_PYTHON=OFF
-RUN make cc
+RUN make cpp
 
 FROM build AS test
-RUN make test_cc
+RUN make test_cpp
 
 FROM build AS package
-RUN make package_cc
+RUN make package_cpp
diff --git a/makefiles/docker/archlinux/cpp.Dockerfile b/makefiles/docker/archlinux/cpp.Dockerfile
index edfe40f663..3ea7ae7d48 100644
--- a/makefiles/docker/archlinux/cpp.Dockerfile
+++ b/makefiles/docker/archlinux/cpp.Dockerfile
@@ -7,10 +7,10 @@ COPY . .
 
 FROM devel AS build
 RUN make third_party BUILD_DOTNET=OFF BUILD_JAVA=OFF BUILD_PYTHON=OFF
-RUN make cc
+RUN make cpp
 
 FROM build AS test
-RUN make test_cc
+RUN make test_cpp
 
 FROM build AS package
-RUN make package_cc
+RUN make package_cpp
diff --git a/makefiles/docker/centos/cpp.Dockerfile b/makefiles/docker/centos/cpp.Dockerfile
index bc31d03f13..d738126c69 100644
--- a/makefiles/docker/centos/cpp.Dockerfile
+++ b/makefiles/docker/centos/cpp.Dockerfile
@@ -7,10 +7,10 @@ COPY . .
 
 FROM devel AS build
 RUN make third_party BUILD_DOTNET=OFF BUILD_JAVA=OFF BUILD_PYTHON=OFF
-RUN make cc
+RUN make cpp
 
 FROM build AS test
-RUN make test_cc
+RUN make test_cpp
 
 FROM build AS package
-RUN make package_cc
+RUN make package_cpp
diff --git a/makefiles/docker/debian/cpp.Dockerfile b/makefiles/docker/debian/cpp.Dockerfile
index e413494b0a..ec4a4994c4 100644
--- a/makefiles/docker/debian/cpp.Dockerfile
+++ b/makefiles/docker/debian/cpp.Dockerfile
@@ -7,10 +7,10 @@ COPY . .
 
 FROM devel AS build
 RUN make third_party BUILD_DOTNET=OFF BUILD_JAVA=OFF BUILD_PYTHON=OFF
-RUN make cc
+RUN make cpp
 
 FROM build AS test
-RUN make test_cc
+RUN make test_cpp
 
 FROM build AS package
-RUN make package_cc
+RUN make package_cpp
diff --git a/makefiles/docker/fedora/cpp.Dockerfile b/makefiles/docker/fedora/cpp.Dockerfile
index d599268a46..c644d1ba58 100644
--- a/makefiles/docker/fedora/cpp.Dockerfile
+++ b/makefiles/docker/fedora/cpp.Dockerfile
@@ -7,10 +7,10 @@ COPY . .
 
 FROM devel AS build
 RUN make third_party BUILD_DOTNET=OFF BUILD_JAVA=OFF BUILD_PYTHON=OFF
-RUN make cc
+RUN make cpp
 
 FROM build AS test
-RUN make test_cc
+RUN make test_cpp
 
 FROM build AS package
-RUN make package_cc
+RUN make package_cpp
diff --git a/makefiles/docker/opensuse/cpp.Dockerfile b/makefiles/docker/opensuse/cpp.Dockerfile
index 2c72bd2bfb..d7beeb71b9 100644
--- a/makefiles/docker/opensuse/cpp.Dockerfile
+++ b/makefiles/docker/opensuse/cpp.Dockerfile
@@ -7,10 +7,10 @@ COPY . .
 
 FROM devel AS build
 RUN make third_party BUILD_DOTNET=OFF BUILD_JAVA=OFF BUILD_PYTHON=OFF
-RUN make cc
+RUN make cpp
 
 FROM build AS test
-RUN make test_cc
+RUN make test_cpp
 
 FROM build AS package
-RUN make package_cc
+RUN make package_cpp
diff --git a/makefiles/docker/ubuntu/cpp.Dockerfile b/makefiles/docker/ubuntu/cpp.Dockerfile
index 473bdc86a0..6272cb70a9 100644
--- a/makefiles/docker/ubuntu/cpp.Dockerfile
+++ b/makefiles/docker/ubuntu/cpp.Dockerfile
@@ -7,10 +7,10 @@ COPY . .
 
 FROM devel AS build
 RUN make third_party BUILD_DOTNET=OFF BUILD_JAVA=OFF BUILD_PYTHON=OFF
-RUN make cc
+RUN make cpp
 
 FROM build AS test
-RUN make test_cc
+RUN make test_cpp
 
 FROM build AS package
-RUN make package_cc
+RUN make package_cpp