diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6fd9c04..23ae08b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,15 +38,15 @@ images_build:
   variables:
     CLIENT_IMAGE_TAG: unittest-tsg-diagnose:latest
     SERVER_WEB_IMAGE_TAG: badssl-tsg-diagnose:latest
-    DNS_IMAGES_TAGE: dns-server-diagnose:latest
+    SERVER_DNS_IMAGE_TAG: dns-server-diagnose:latest
   script:
     - mkdir -p images
     - docker build -t $CLIENT_IMAGE_TAG -f ./images_build/client/Dockerfile ./images_build/client/
     - docker save $CLIENT_IMAGE_TAG > images/client.tar
     - docker build -t $SERVER_WEB_IMAGE_TAG -f ./images_build/server_web/Dockerfile ./images_build/server_web/
     - docker save $SERVER_WEB_IMAGE_TAG  > images/server_web.tar
-    - docker build -t $DNS_IMAGES_TAGE -f ./images_build/dnsmasq/Dockerfile ./images_build/dnsmasq
-    - docker save $DNS_IMAGES_TAGE > images/dns.tar
+    - docker build -t $SERVER_DNS_IMAGE_TAG -f ./images_build/server_dns/Dockerfile ./images_build/server_dns/
+    - docker save $SERVER_DNS_IMAGE_TAG > images/server_dns.tar
 
 
 feature_branch_build:
diff --git a/cmake/Package.cmake b/cmake/Package.cmake
index 592c3eb..82664db 100644
--- a/cmake/Package.cmake
+++ b/cmake/Package.cmake
@@ -24,7 +24,7 @@ set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PostunInstall
 install(FILES compose/docker-compose.yml DESTINATION ./compose)
 install(FILES images_build/client/unittest/etc/tsg-diagnose.config DESTINATION ./etc)
 install(FILES service/tsg-diagnose.service DESTINATION /usr/lib/systemd/system)
-install(FILES images_build/dnsmasq/config/dnsmasq.conf DESTINATION /opt/tsg/tsg-diagnose/etc/)
+install(FILES images_build/server_dns/config/dnsmasq.conf DESTINATION /opt/tsg/tsg-diagnose/etc/)
 install(DIRECTORY images/ DESTINATION ./images)
 
 include(CPack)
diff --git a/cmake/PostInstall.in b/cmake/PostInstall.in
index 3fb1b80..a55741c 100644
--- a/cmake/PostInstall.in
+++ b/cmake/PostInstall.in
@@ -6,4 +6,4 @@ if [ $1 == 2 ]; then
 fi
 docker load < /opt/tsg/tsg-diagnose/images/server_web.tar
 docker load < /opt/tsg/tsg-diagnose/images/client.tar
-docker load < /opt/tsg/tsg-diagnose/images/dns.tar
+docker load < /opt/tsg/tsg-diagnose/images/server_dns.tar
diff --git a/images_build/dnsmasq/Dockerfile b/images_build/server_dns/Dockerfile
similarity index 100%
rename from images_build/dnsmasq/Dockerfile
rename to images_build/server_dns/Dockerfile
diff --git a/images_build/dnsmasq/README.md b/images_build/server_dns/README.md
similarity index 100%
rename from images_build/dnsmasq/README.md
rename to images_build/server_dns/README.md
diff --git a/images_build/dnsmasq/config/dnsmasq.conf b/images_build/server_dns/config/dnsmasq.conf
similarity index 100%
rename from images_build/dnsmasq/config/dnsmasq.conf
rename to images_build/server_dns/config/dnsmasq.conf
diff --git a/images_build/dnsmasq/dnsmasq.conf b/images_build/server_dns/dnsmasq.conf
similarity index 100%
rename from images_build/dnsmasq/dnsmasq.conf
rename to images_build/server_dns/dnsmasq.conf