diff --git a/README.md b/README.md
index ec9730b..6d02885 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+[![Link to data-tools in hipages Developer Portal, Component: data-tools](https://backyard.k8s.hipages.com.au/api/badges/entity/default/Component/data-tools/badge/pingback "Link to data-tools in hipages Developer Portal")](https://backyard.k8s.hipages.com.au/catalog/default/Component/data-tools)
+[![Entity owner badge, owner: data-platform](https://backyard.k8s.hipages.com.au/api/badges/entity/default/Component/data-tools/badge/owner "Entity owner badge")](https://backyard.k8s.hipages.com.au/catalog/default/Component/data-tools)
 # hip-data-tools
 © Hipages Group Pty Ltd 2019-2022
 
diff --git a/hip_data_tools/etl/adwords_to_athena.py b/hip_data_tools/etl/adwords_to_athena.py
index a4eea47..ced190f 100644
--- a/hip_data_tools/etl/adwords_to_athena.py
+++ b/hip_data_tools/etl/adwords_to_athena.py
@@ -3,7 +3,7 @@
 """
 from typing import List, Any, Optional, Tuple
 
-from attr import dataclass
+from dataclasses import dataclass
 from pandas import DataFrame
 
 from hip_data_tools.common import LOG
diff --git a/hip_data_tools/etl/adwords_to_s3.py b/hip_data_tools/etl/adwords_to_s3.py
index 366fdba..47aa324 100644
--- a/hip_data_tools/etl/adwords_to_s3.py
+++ b/hip_data_tools/etl/adwords_to_s3.py
@@ -5,7 +5,7 @@
 
 import numpy as np
 import pandas as pd
-from attr import dataclass
+from dataclasses import dataclass
 from googleads.adwords import ServiceQueryBuilder, ReportQuery
 from pandas import DataFrame
 
diff --git a/hip_data_tools/etl/athena_to_athena.py b/hip_data_tools/etl/athena_to_athena.py
index cb1366c..b2ecd7c 100644
--- a/hip_data_tools/etl/athena_to_athena.py
+++ b/hip_data_tools/etl/athena_to_athena.py
@@ -3,7 +3,7 @@
 """
 from typing import Optional, List
 
-from attr import dataclass
+from dataclasses import dataclass
 
 from hip_data_tools.aws.athena import AthenaUtil
 from hip_data_tools.aws.common import AwsConnectionSettings, AwsConnectionManager
diff --git a/hip_data_tools/etl/athena_to_cassandra.py b/hip_data_tools/etl/athena_to_cassandra.py
index b88d3ac..4d99f61 100644
--- a/hip_data_tools/etl/athena_to_cassandra.py
+++ b/hip_data_tools/etl/athena_to_cassandra.py
@@ -2,7 +2,7 @@
 handle ETL of data from Athena to Cassandra
 """
 from typing import Optional, List
-from attr import dataclass
+from dataclasses import dataclass
 
 from hip_data_tools.apache.cassandra import CassandraConnectionSettings
 from hip_data_tools.aws.athena import AthenaUtil
diff --git a/hip_data_tools/etl/athena_to_dataframe.py b/hip_data_tools/etl/athena_to_dataframe.py
index cbf5ff6..bfc4093 100644
--- a/hip_data_tools/etl/athena_to_dataframe.py
+++ b/hip_data_tools/etl/athena_to_dataframe.py
@@ -1,7 +1,7 @@
 """
 handle ETL of data from Athena to Pandas Dataframe
 """
-from attr import dataclass
+from dataclasses import dataclass
 
 from hip_data_tools.aws.athena import AthenaUtil
 from hip_data_tools.aws.common import AwsConnectionSettings, AwsConnectionManager
diff --git a/hip_data_tools/etl/athena_to_s3.py b/hip_data_tools/etl/athena_to_s3.py
index 484c969..871bf5e 100644
--- a/hip_data_tools/etl/athena_to_s3.py
+++ b/hip_data_tools/etl/athena_to_s3.py
@@ -3,7 +3,7 @@
 """
 from typing import Optional, List
 
-from attr import dataclass
+from dataclasses import dataclass
 
 from hip_data_tools.aws.athena import AthenaUtil
 from hip_data_tools.aws.common import AwsConnectionSettings, AwsConnectionManager
diff --git a/hip_data_tools/etl/google_sheet_to_athena.py b/hip_data_tools/etl/google_sheet_to_athena.py
index c1b975c..fb66d4e 100644
--- a/hip_data_tools/etl/google_sheet_to_athena.py
+++ b/hip_data_tools/etl/google_sheet_to_athena.py
@@ -2,7 +2,7 @@
 Module to deal with data transfer from Google sheets to Athena
 """
 
-from attr import dataclass
+from dataclasses import dataclass
 
 from hip_data_tools.aws.athena import AthenaUtil, get_table_settings_for_dataframe
 from hip_data_tools.aws.common import AwsConnectionManager
diff --git a/hip_data_tools/etl/google_sheet_to_s3.py b/hip_data_tools/etl/google_sheet_to_s3.py
index 36b4945..7433f53 100644
--- a/hip_data_tools/etl/google_sheet_to_s3.py
+++ b/hip_data_tools/etl/google_sheet_to_s3.py
@@ -2,7 +2,7 @@
 Module to deal with data transfer from Google sheets to S3
 """
 
-from attr import dataclass
+from dataclasses import dataclass
 
 from hip_data_tools.aws.common import AwsConnectionManager
 from hip_data_tools.aws.common import AwsConnectionSettings
diff --git a/hip_data_tools/etl/s3_to_cassandra.py b/hip_data_tools/etl/s3_to_cassandra.py
index 97cd80d..b927c0e 100644
--- a/hip_data_tools/etl/s3_to_cassandra.py
+++ b/hip_data_tools/etl/s3_to_cassandra.py
@@ -3,7 +3,7 @@
 """
 from typing import Optional, List
 
-from attr import dataclass
+from dataclasses import dataclass
 from cassandra.datastax.graph import Result
 from cassandra import ConsistencyLevel
 
diff --git a/hip_data_tools/google/common.py b/hip_data_tools/google/common.py
index d09e95e..68a78da 100644
--- a/hip_data_tools/google/common.py
+++ b/hip_data_tools/google/common.py
@@ -5,7 +5,7 @@
 from abc import ABC, abstractmethod
 from typing import List
 
-from attr import dataclass
+from dataclasses import dataclass
 from oauth2client.service_account import ServiceAccountCredentials
 
 from hip_data_tools.common import SecretsManager, ENVIRONMENT, KeyValueSource