diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index acba895f222a5783fdca654c4d60fa4a7bb30d5f..c0ce21437c212466b491357cfbfc594fb2e64949 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -128,6 +128,7 @@ set (COMMON_LIB_SRC_FILES
   utils/strerror_r_wrapper.cpp
   CreationLog.cpp
   Configuration.cpp
+  ConfigurationFile.cpp  
   TapePool.cpp
   Timer.cpp
   UserIdentity.cpp
diff --git a/tapeserver/daemon/ConfigurationFile.cpp b/common/ConfigurationFile.cpp
similarity index 100%
rename from tapeserver/daemon/ConfigurationFile.cpp
rename to common/ConfigurationFile.cpp
diff --git a/tapeserver/daemon/ConfigurationFile.hpp b/common/ConfigurationFile.hpp
similarity index 100%
rename from tapeserver/daemon/ConfigurationFile.hpp
rename to common/ConfigurationFile.hpp
diff --git a/tapeserver/daemon/CMakeLists.txt b/tapeserver/daemon/CMakeLists.txt
index 41fef79f40d534b5ce734e03784fd5cee0ddbe3a..1168864e9d341252078987df9ae43736e9c5a9e9 100644
--- a/tapeserver/daemon/CMakeLists.txt
+++ b/tapeserver/daemon/CMakeLists.txt
@@ -13,7 +13,6 @@ include_directories(${PROTOBUF3_INCLUDE_DIRS})
 add_library(ctatapedaemon
   ${WDMsgSources}
   CommandLineParams.cpp
-  ConfigurationFile.cpp
   DriveHandler.cpp
   DriveHandlerProxy.cpp
   GarbageCollectorHandler.cpp
diff --git a/tapeserver/daemon/ConfigurationFileTests.cpp b/tapeserver/daemon/ConfigurationFileTests.cpp
index 440c513b87ebd92bd827ff1bd656338aeb52a311..d48c62b86b6ed43dd6efbd29610c1cbe9c6514f3 100644
--- a/tapeserver/daemon/ConfigurationFileTests.cpp
+++ b/tapeserver/daemon/ConfigurationFileTests.cpp
@@ -18,7 +18,7 @@
 
 #include <gtest/gtest.h>
 
-#include "ConfigurationFile.hpp"
+#include "common/ConfigurationFile.hpp"
 #include "tests/TempFile.hpp"
 
 namespace unitTests {
@@ -36,4 +36,4 @@ TEST(cta_Daemon, ConfigurationFile) {
   ASSERT_EQ(2, cf.entries.at("cat1").at("key1").line);
 }
 
-} // namespace unitTests
\ No newline at end of file
+} // namespace unitTests
diff --git a/tapeserver/daemon/SourcedParameter.hpp b/tapeserver/daemon/SourcedParameter.hpp
index 4d1fddee49995b24b407f71c47a5197e129da4af..3d3855040275487b1fd646d63520a9eb0df794ce 100644
--- a/tapeserver/daemon/SourcedParameter.hpp
+++ b/tapeserver/daemon/SourcedParameter.hpp
@@ -19,7 +19,7 @@
 #pragma once
 
 #include "common/exception/Exception.hpp"
-#include "tapeserver/daemon/ConfigurationFile.hpp"
+#include "common/ConfigurationFile.hpp"
 #include "common/utils/utils.hpp"
 #include "common/log/LogContext.hpp"
 #include "common/log/Logger.hpp"
@@ -115,4 +115,4 @@ private:
 
 
 
-}}} // namespace cta::tape::daemon
\ No newline at end of file
+}}} // namespace cta::tape::daemon
diff --git a/tapeserver/daemon/TapedConfiguration.cpp b/tapeserver/daemon/TapedConfiguration.cpp
index 01e0d1f16d13838ffddd0695f53915990aa4abc9..7f7d6831fbac2d030c2172030f5828a5ac29fee5 100644
--- a/tapeserver/daemon/TapedConfiguration.cpp
+++ b/tapeserver/daemon/TapedConfiguration.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "TapedConfiguration.hpp"
-#include "ConfigurationFile.hpp"
+#include "common/ConfigurationFile.hpp"
 #include "Tpconfig.hpp"
 
 namespace cta { namespace tape { namespace daemon {
diff --git a/tapeserver/daemon/TapedConfigurationTests.cpp b/tapeserver/daemon/TapedConfigurationTests.cpp
index 4da6a6733f5fc854d8565c84de7d4e71ac8a0b17..fe0c95e5a89254b1bdca1695e7ad4b062602357b 100644
--- a/tapeserver/daemon/TapedConfigurationTests.cpp
+++ b/tapeserver/daemon/TapedConfigurationTests.cpp
@@ -18,7 +18,7 @@
 
 #include <gtest/gtest.h>
 
-#include "tapeserver/daemon/ConfigurationFile.hpp"
+#include "common/ConfigurationFile.hpp"
 #include "tapeserver/daemon/TapedConfiguration.hpp"
 #include "tests/TempFile.hpp"
 #include "common/log/StdoutLogger.hpp"