diff --git a/parser/parser-cp2k/cp2kparser/parser.py b/parser/parser-cp2k/cp2kparser/parser.py
index ba0c4d323395ac09aa0321ebb70c3880a8694b09..330281baec46cc04c8ddf498afb4e2ce195334c7 100644
--- a/parser/parser-cp2k/cp2kparser/parser.py
+++ b/parser/parser-cp2k/cp2kparser/parser.py
@@ -59,7 +59,7 @@ class CP2KParser(ParserInterface):
         self.main_parser = get_main_parser(version_id, run_type)(self.parser_context.main_file, self.parser_context)
 
     def get_metainfo_filename(self):
-        return "cp2k.nomadmetainfo.json"
+        return "cp2k.input.nomadmetainfo.json"
 
     def get_parser_info(self):
         return {'name': 'cp2k-parser', 'version': '1.0'}
diff --git a/src/main/scala/eu/nomad_lab/parsers/Cp2kParser.scala b/src/main/scala/eu/nomad_lab/parsers/Cp2kParser.scala
index 0d4c29b59733f6bbd1acc7e4baaa030f6c99effa..c8888f28566e116bf88b5a0f96097da6595616ca 100644
--- a/src/main/scala/eu/nomad_lab/parsers/Cp2kParser.scala
+++ b/src/main/scala/eu/nomad_lab/parsers/Cp2kParser.scala
@@ -56,7 +56,7 @@ object Cp2kParser extends SimpleExternalParserGenerator(
     "nomad_meta_info/common.nomadmetainfo.json",
     "nomad_meta_info/meta_types.nomadmetainfo.json",
     "nomad_meta_info/cp2k.input.nomadmetainfo.json",
-    "nomad_meta_info/cp2k.nomadmetainfo.json"
+    "nomad_meta_info/cp2k.general.nomadmetainfo.json"
   ) ++ DefaultPythonInterpreter.commonFiles(),
   dirMap = Map(
     "parser-cp2k" -> "parsers/cp2k/parser/parser-cp2k",