diff --git a/components/01_Atoms/_atoms.scss b/components/01_Atoms/_atoms.scss
index bb00e0c..9e7bb7f 100644
--- a/components/01_Atoms/_atoms.scss
+++ b/components/01_Atoms/_atoms.scss
@@ -7,3 +7,4 @@
 @import 'input/input';
 @import 'image/image';
 @import 'logo/logo';
+@import 'tag/tag';
\ No newline at end of file
diff --git a/components/01_Atoms/tag/_tag.scss b/components/01_Atoms/tag/_tag.scss
new file mode 100644
index 0000000..2fb9ddc
--- /dev/null
+++ b/components/01_Atoms/tag/_tag.scss
@@ -0,0 +1,14 @@
+.LP-Tag{
+	padding: 8px 14px;
+	background-color: #D7CEC7;
+	border-radius: 2px;
+	width: max-content;
+
+	.LP-Paragraph{
+		padding: 0;
+		margin: 0;
+		font-family: $-primary-sans-serif-font;
+		font-size: 1em;
+		display: inline;
+	}
+}
\ No newline at end of file
diff --git a/components/01_Atoms/tag/tag.config.json b/components/01_Atoms/tag/tag.config.json
new file mode 100644
index 0000000..b745862
--- /dev/null
+++ b/components/01_Atoms/tag/tag.config.json
@@ -0,0 +1,6 @@
+{
+	"title": "Tag",
+	"context": {
+		"text": "Im a tag"
+	}
+}
\ No newline at end of file
diff --git a/components/01_Atoms/tag/tag.hbs b/components/01_Atoms/tag/tag.hbs
new file mode 100644
index 0000000..55cc3e3
--- /dev/null
+++ b/components/01_Atoms/tag/tag.hbs
@@ -0,0 +1,3 @@
+<div class="LP-Tag">
+	{{> @paragraph text=text}}
+</div>
\ No newline at end of file
diff --git a/components/02_Molecules/_molecules.scss b/components/02_Molecules/_molecules.scss
index c9862b0..7219798 100644
--- a/components/02_Molecules/_molecules.scss
+++ b/components/02_Molecules/_molecules.scss
@@ -1,3 +1,3 @@
 @import 'textSection/textSection';
 @import 'placeTeaser/placeTeaser';
-@import 'securityMeasureList/securityMeasureList';
\ No newline at end of file
+@import 'tagList/tagList';
\ No newline at end of file
diff --git a/components/02_Molecules/securityMeasureList/_securityMeasureList.scss b/components/02_Molecules/securityMeasureList/_securityMeasureList.scss
deleted file mode 100644
index d767e59..0000000
--- a/components/02_Molecules/securityMeasureList/_securityMeasureList.scss
+++ /dev/null
@@ -1,17 +0,0 @@
-.LP-SecurityMeasure__List{
-    list-style-type: none;
-    display: flex;
-    padding:0;
-    margin: 0;
-
-    .LP-SecurityMeasure__Item{
-        margin: 0 8px;
-        padding: 8px 14px;
-        background-color: #D7CEC7;
-        border-radius: 2px;
-        .LP-Text{
-            font-family: $-primary-sans-serif-font;
-            font-size: 1.2rem;
-        }
-    }
-}
\ No newline at end of file
diff --git a/components/02_Molecules/securityMeasureList/securityMeasureList.config.json b/components/02_Molecules/securityMeasureList/securityMeasureList.config.json
deleted file mode 100644
index 9e26dfe..0000000
--- a/components/02_Molecules/securityMeasureList/securityMeasureList.config.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/components/02_Molecules/securityMeasureList/securityMeasureList.hbs b/components/02_Molecules/securityMeasureList/securityMeasureList.hbs
deleted file mode 100644
index ac9de01..0000000
--- a/components/02_Molecules/securityMeasureList/securityMeasureList.hbs
+++ /dev/null
@@ -1,7 +0,0 @@
-<ul class="LP-SecurityMeasure__List">
-    <li class="LP-SecurityMeasure__Item"><span class="LP-Text">Kameras</span></li>
-    <li class="LP-SecurityMeasure__Item"><span class="LP-Text">Zaun</span></li>
-    <li class="LP-SecurityMeasure__Item"><span class="LP-Text">Wachhund</span></li>
-    <li class="LP-SecurityMeasure__Item"><span class="LP-Text">Alarmanlage</span></li>
-    <li class="LP-SecurityMeasure__Item"><span class="LP-Text">Selbstschussanlage</span></li>
-</ul>
\ No newline at end of file
diff --git a/components/02_Molecules/tagList/_tagList.scss b/components/02_Molecules/tagList/_tagList.scss
new file mode 100644
index 0000000..ed74575
--- /dev/null
+++ b/components/02_Molecules/tagList/_tagList.scss
@@ -0,0 +1,13 @@
+.LP-TagList{
+	.LP-TagList__List{
+		list-style-type: none;
+		display: flex;
+		flex-wrap: wrap;
+		padding:0;
+		margin: 0;
+
+		.LP-TagList__Item{
+			margin: 6px;
+		}
+	}
+}
\ No newline at end of file
diff --git a/components/02_Molecules/tagList/tagList.config.json b/components/02_Molecules/tagList/tagList.config.json
new file mode 100644
index 0000000..8a5c339
--- /dev/null
+++ b/components/02_Molecules/tagList/tagList.config.json
@@ -0,0 +1,11 @@
+{
+	"title": "TagList",
+	"context": {
+		"tags": [
+			"Kamera",
+			"Wachhund",
+			"Zaun",
+			"Security"
+		]
+	}
+}
\ No newline at end of file
diff --git a/components/02_Molecules/tagList/tagList.hbs b/components/02_Molecules/tagList/tagList.hbs
new file mode 100644
index 0000000..437a218
--- /dev/null
+++ b/components/02_Molecules/tagList/tagList.hbs
@@ -0,0 +1,7 @@
+<div class="LP-TagList">
+	<ul class="LP-TagList__List">
+		{{#each tags}}
+			<li class="LP-TagList__Item">{{> @tag text=this}}</li>
+		{{/each}}
+	</ul>
+</div>
\ No newline at end of file