diff --git a/src/app/article.service.ts b/src/app/article.service.ts
index d519285..d0a153b 100644
--- a/src/app/article.service.ts
+++ b/src/app/article.service.ts
@@ -6,7 +6,7 @@ import { Observable } from 'rxjs';
   providedIn: 'root',
 })
 export class ArticleService {
-  private articleUrl = 'http://midaiganes.irw.ee/api/list/dad2ec5d';
+  private articleUrl = 'https://proovitoo.lunasqu.ee/article.json';
 
   constructor(private http: HttpClient) { }
 
diff --git a/src/app/article/article.component.html b/src/app/article/article.component.html
index 35bc42d..e8137ea 100644
--- a/src/app/article/article.component.html
+++ b/src/app/article/article.component.html
@@ -6,3 +6,8 @@
   </div>
 </ng-container>
 <div class="content-wrapper" [innerHTML]="article.body"></div>
+<div class="tags">
+  <ul>
+    <li *ngFor="let tag of article.tags">{{ tag }}</li>
+  </ul>
+</div>
diff --git a/src/app/article/article.component.styl b/src/app/article/article.component.styl
index ff296cf..961c1da 100644
--- a/src/app/article/article.component.styl
+++ b/src/app/article/article.component.styl
@@ -14,3 +14,11 @@
   left: 0
   width: 100%
   height: 100%
+
+.tags li
+  display: inline-block
+  padding: 5px 10px
+  color: #fff
+  background: #ff57a2
+  border-radius: 99px
+  margin-right: 10px
diff --git a/src/app/list.service.ts b/src/app/list.service.ts
index 7b0ba2c..3a184fc 100644
--- a/src/app/list.service.ts
+++ b/src/app/list.service.ts
@@ -8,7 +8,7 @@ import { Observable } from 'rxjs';
   providedIn: 'root',
 })
 export class ListService {
-  private listUrl = 'http://midaiganes.irw.ee/api/list?limit=100';
+  private listUrl = 'https://proovitoo.lunasqu.ee/list.json';
 
   constructor(private http: HttpClient) { }